Makefile: drop the NO_INSTALL variable
The last user was just removed; There is no longer any need to carry it around. Should we ever run into a need for it again, it is easy enough to revert this commit. It is unlikely, though, that we need `NO_INSTALL` again: as we saw with the just-removed item, `git-remote-testgit`, we have better locations to put executables and scripts that we do not want to install, e.g. a subdirectory in `t/`, or `contrib/`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Apr 18, 2019 at 06:16 UTC
0b64e21cc220a73f7a49d932d44e8cfc11532d0f
1 file changed
+8
-13
Makefile
+8
-13
@@ -661,10 +661,6 @@ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
661
SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
662
SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
663
664
-SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
665
-SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
666
-SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
667
-
664
# Individual rules to allow e.g.
665
# "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
666
# from subdirectories like contrib/*/
@@ -674,11 +670,11 @@ build-sh-script: $(SCRIPT_SH_GEN)
670
build-python-script: $(SCRIPT_PYTHON_GEN)
671
672
.PHONY: install-perl-script install-sh-script install-python-script
677
-install-sh-script: $(SCRIPT_SH_INS)
673
+install-sh-script: $(SCRIPT_SH_GEN)
674
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
679
-install-perl-script: $(SCRIPT_PERL_INS)
675
+install-perl-script: $(SCRIPT_PERL_GEN)
676
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
681
-install-python-script: $(SCRIPT_PYTHON_INS)
677
+install-python-script: $(SCRIPT_PYTHON_GEN)
678
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
679
680
.PHONY: clean-perl-script clean-sh-script clean-python-script
@@ -689,9 +685,9 @@ clean-perl-script:
685
clean-python-script:
686
$(RM) $(SCRIPT_PYTHON_GEN)
687
692
-SCRIPTS = $(SCRIPT_SH_INS) \
693
- $(SCRIPT_PERL_INS) \
694
- $(SCRIPT_PYTHON_INS) \
688
+SCRIPTS = $(SCRIPT_SH_GEN) \
689
+ $(SCRIPT_PERL_GEN) \
690
+ $(SCRIPT_PYTHON_GEN) \
691
git-instaweb
692
693
ETAGS_TARGET = TAGS
@@ -2683,7 +2679,6 @@ endif
2679
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
2680
2681
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
2686
-all:: $(NO_INSTALL)
2682
2683
bin-wrappers/%: wrap-for-bin.sh
2684
@mkdir -p bin-wrappers
@@ -2967,7 +2962,7 @@ rpm::
2962
2963
artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
2964
GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
2970
- $(NO_INSTALL) $(MOFILES)
2965
+ $(MOFILES)
2966
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \
2967
SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
2968
test -n "$(ARTIFACTS_DIRECTORY)"
@@ -3016,7 +3011,7 @@ clean: profile-clean coverage-clean cocciclean
3011
$(RM) $(OBJECTS)
3012
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
3013
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
3019
- $(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
3014
+ $(RM) $(TEST_PROGRAMS)
3015
$(RM) $(FUZZ_PROGRAMS)
3016
$(RM) -r bin-wrappers $(dep_dirs)
3017
$(RM) -r po/build/