From: Ævar Arnfjörð Bjarmason Date: Tue, 28 Jun 2022 10:16:02 +0000 (+0200) Subject: gitweb/Makefile: add a "NO_GITWEB" parameter X-Git-Url: https://git.ladys.computer/Gitweb/commitdiff_plain/9c648e20c91f37cf166bdd57a3ee4257fe971d92f77576d0d09843e9c3a1f581?hp=8340d73727ba0fc4dfbece56f49a150bab1f6f9f59809b27c80423d433c019ca 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 Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 94e0d72..d84d578 100644 --- a/Makefile +++ b/Makefile @@ -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