aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorCharles Bailey <charles@hashpling.org>2007-12-19 12:25:27 +0000
committerJunio C Hamano <gitster@pobox.com>2007-12-19 14:59:19 -0800
commitc5699693638d0471bf74425238d802d2bc9e8c0f (patch)
treef11cd2e1509a242e2458f1f127d078d61e932039 /Makefile
parentecaa0cff44577700400903aa47eb0e99a135e423 (diff)
downloadgit-c5699693638d0471bf74425238d802d2bc9e8c0f.tar.gz
git-c5699693638d0471bf74425238d802d2bc9e8c0f.tar.xz
Fix git-instaweb breakage on MacOS X due to the limited sed functionality
git-instaweb relied on a pipe in a sed script, but this is not supported by MacOS X sed when using BREs. git-instaweb relies on a working perl in any case, and perl re are more consistent between platforms, so replace sed invocation with an equivalent perl invocation. Also, fix the documented -b "" to work without giving a spurious 'command not found' error. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 617e5f5a4..d6d3d65b1 100644
--- a/Makefile
+++ b/Makefile
@@ -880,6 +880,7 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
-e '/@@GITWEB_CGI@@/d' \
-e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
-e '/@@GITWEB_CSS@@/d' \
+ -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
$@.sh > $@+ && \
chmod +x $@+ && \
mv $@+ $@