summaryrefslogtreecommitdiff
path: root/gitweb/Makefile
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2010-09-26 13:02:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-30 18:50:33 (GMT)
commit9b93aeb29cea16880926bc150ac31cfb31475a44 (patch)
treea9beefab6c22c5850ff3e11ab48a4606df7d7f4c /gitweb/Makefile
parent958a8467216ca607ca6a24059d5c641347927333 (diff)
downloadgit-9b93aeb29cea16880926bc150ac31cfb31475a44.zip
git-9b93aeb29cea16880926bc150ac31cfb31475a44.tar.gz
git-9b93aeb29cea16880926bc150ac31cfb31475a44.tar.bz2
gitweb/Makefile: Include gitweb/config.mak
Allow for gitweb-specific Makefile config to reside in config.mak file in the 'gitweb/' subdirectory. This means that gitweb-specific build-time configuration variable can reside in gitweb-specific gitweb/config.mak Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gitweb/Makefile')
-rw-r--r--gitweb/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile
index f218074..df908a1 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -39,6 +39,7 @@ GITWEB_SITE_FOOTER =
# include user config
-include ../config.mak.autogen
-include ../config.mak
+-include config.mak
# determine version
../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE