зеркало из https://github.com/microsoft/git.git
gitweb/Makefile: add a "NO_GITWEB" parameter
From looking at the {Free,Net,Dragonfly}BSD packages for git[1] they've been monkeypatching "gitweb" out of the Makefile, let's be nicer and provide a NO_GITWEB=Y for their use. For the "all" target this allows for optionally restoring what's been the status quo before the preceding commit, but now we'll also behave correctly on the subsequent "make install". As before our installation of gitweb can be suppressed with NO_PERL. For backwards compatibility the NO_PERL=Y flag by itself still doesn't change whether or not we build gitweb, unlike the new NO_GITWEB=Y flag. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
d3b827408c
Коммит
a35258c62a
7
Makefile
7
Makefile
|
@ -309,6 +309,11 @@ include shared.mak
|
|||
# distributions that want to use their packaged versions of Perl
|
||||
# modules, instead of the fallbacks shipped with Git.
|
||||
#
|
||||
# Define NO_GITWEB if you do not want to build or install
|
||||
# 'gitweb'. Note that defining NO_PERL currently has the same effect
|
||||
# on not installing gitweb, but not on whether it's built in the
|
||||
# gitweb/ directory.
|
||||
#
|
||||
# Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python
|
||||
# but /usr/bin/python2.7 or /usr/bin/python3 on some platforms).
|
||||
#
|
||||
|
@ -3042,7 +3047,9 @@ include gitweb/Makefile
|
|||
|
||||
.PHONY: gitweb
|
||||
gitweb: $(MAK_DIR_GITWEB_ALL)
|
||||
ifndef NO_GITWEB
|
||||
all:: gitweb
|
||||
endif
|
||||
|
||||
### Installation rules
|
||||
|
||||
|
|
|
@ -130,9 +130,11 @@ install-gitweb: $(MAK_DIR_GITWEB_ALL)
|
|||
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'
|
||||
$(INSTALL) -m 644 $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_FILES)) \
|
||||
'$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'
|
||||
ifndef NO_GITWEB
|
||||
ifndef NO_PERL
|
||||
install: install-gitweb
|
||||
endif
|
||||
endif
|
||||
|
||||
### Cleaning rules
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче