diff options
| author | Jeff King <peff@peff.net> | 2009-04-28 03:34:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-28 05:59:38 (GMT) |
| commit | 62f780dcc6a5f1a38d9f8e25234a91d16ab8fbbd (patch) | |
| tree | e023c2ac0b81e37f83ff000ee709f7ddca2ce3a2 /Makefile | |
| parent | b9d622e711f0bf0280996bd79ec8509475ae80e5 (diff) | |
| download | git-62f780dcc6a5f1a38d9f8e25234a91d16ab8fbbd.zip git-62f780dcc6a5f1a38d9f8e25234a91d16ab8fbbd.tar.gz git-62f780dcc6a5f1a38d9f8e25234a91d16ab8fbbd.tar.bz2 | |
Makefile: fix NO_PERL bug with gitweb
When the user has defined NO_PERL, we want to skip building
gitweb entirely. However, the conditional to add
gitweb/gitweb.cgi to OTHER_PROGRAMS was evaluated before we
actually parsed the user's config.mak. This meant that "make
NO_PERL=NoThanks" worked fine, but putting "NO_PERL=NoThanks"
into your config.mak broke the build (it wanted gitweb.cgi
to satisfy "all", but the rule to build it was conditionally
ignored, so it complained).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -365,9 +365,6 @@ ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) # what 'all' will build but not install in gitexecdir OTHER_PROGRAMS = git$X -ifndef NO_PERL -OTHER_PROGRAMS += gitweb/gitweb.cgi -endif # Set paths to tools early so that they can be used for version tests. ifndef SHELL_PATH @@ -1280,6 +1277,7 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl chmod +x $@+ && \ mv $@+ $@ +OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.cgi: gitweb/gitweb.perl $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \ |