aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGerrit Pape <pape@smarden.org>2008-04-05 16:37:18 +0000
committerJunio C Hamano <gitster@pobox.com>2008-04-05 12:03:01 -0700
commit26ffcb7690139dd53f5deb4f875895f22bebee4f (patch)
treeadffed20abddc393035be5b35c3cacd2baee3491 /Makefile
parent17a8b25005bb09b03bee7ddac5412c7d29675eef (diff)
downloadgit-26ffcb7690139dd53f5deb4f875895f22bebee4f.tar.gz
git-26ffcb7690139dd53f5deb4f875895f22bebee4f.tar.xz
gitweb: fallback to system-wide config file (fixup)
The earlier one did not correctly propagate GITWEB_CONFIG_SYSTEM from Makefile to generated gitweb.cgi script. Signed-off-by: Gerrit Pape <pape@smarden.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 a88acf6ef..78b773862 100644
--- a/Makefile
+++ b/Makefile
@@ -1035,6 +1035,7 @@ gitweb/gitweb.cgi: gitweb/gitweb.perl
-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
-e 's|++GIT_BINDIR++|$(bindir)|g' \
-e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
+ -e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \
-e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
-e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
-e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \