summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-08-02 13:50:20 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-08-02 13:58:04 -0700
commit06c084d28b150ac1e2ed0c6f3ce7db6ca42dfc67 (patch)
treeac3fd9a8973e0a92d5ac19c0c83e8a1d33e5a03f /Makefile
parentgitweb: require $ENV{'GITWEB_CONFIG'} (diff)
downloadtgif-06c084d28b150ac1e2ed0c6f3ce7db6ca42dfc67.tar.xz
gitweb: do not use @@FOO@@ for replaced tokens
This makes it easier to run gitweb/gitweb.perl without token substitution. Using @@ makes Perl emit "unintended interpolation" warnings. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index a2b4acaaae..3816ef7971 100644
--- a/Makefile
+++ b/Makefile
@@ -584,15 +584,15 @@ git-status: git-commit
gitweb/gitweb.cgi: gitweb/gitweb.perl
rm -f $@ $@+
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
- -e 's|@@GIT_VERSION@@|$(GIT_VERSION)|g' \
- -e 's|@@GIT_BINDIR@@|$(bindir)|g' \
- -e 's|@@GITWEB_CONFIG@@|$(GITWEB_CONFIG)|g' \
- -e 's|@@GITWEB_SITENAME@@|$(GITWEB_SITENAME)|g' \
- -e 's|@@GITWEB_PROJECTROOT@@|$(GITWEB_PROJECTROOT)|g' \
- -e 's|@@GITWEB_LIST@@|$(GITWEB_LIST)|g' \
- -e 's|@@GITWEB_HOMETEXT@@|$(GITWEB_HOMETEXT)|g' \
- -e 's|@@GITWEB_CSS@@|$(GITWEB_CSS)|g' \
- -e 's|@@GITWEB_LOGO@@|$(GITWEB_LOGO)|g' \
+ -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
+ -e 's|++GIT_BINDIR++|$(bindir)|g' \
+ -e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
+ -e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
+ -e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
+ -e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
+ -e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
+ -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
+ -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
$< >$@+
chmod +x $@+
mv $@+ $@