Andrew's git / gitweb.git / diff
?
gitweb: fallback to system-wide config file (fixup)
authorGerrit Pape <pape@smarden.org>
Sat, 5 Apr 2008 16:37:18 +0000 (16:37 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 5 Apr 2008 19:03:01 +0000 (12:03 -0700)
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>
Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index a88acf6efdbd8ae67f5dae22c280ad0a56c1df39..78b773862197d46247aa73e5e38aac30edceecc2 100644 (file)
--- 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' \