Skip to content

Commit 0b64e21

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5afb2ce commit 0b64e21

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

Makefile

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -661,10 +661,6 @@ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
661661
SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
662662
SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
663663

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-
668664
# Individual rules to allow e.g.
669665
# "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
670666
# from subdirectories like contrib/*/
@@ -674,11 +670,11 @@ build-sh-script: $(SCRIPT_SH_GEN)
674670
build-python-script: $(SCRIPT_PYTHON_GEN)
675671

676672
.PHONY: install-perl-script install-sh-script install-python-script
677-
install-sh-script: $(SCRIPT_SH_INS)
673+
install-sh-script: $(SCRIPT_SH_GEN)
678674
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
679-
install-perl-script: $(SCRIPT_PERL_INS)
675+
install-perl-script: $(SCRIPT_PERL_GEN)
680676
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
681-
install-python-script: $(SCRIPT_PYTHON_INS)
677+
install-python-script: $(SCRIPT_PYTHON_GEN)
682678
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
683679

684680
.PHONY: clean-perl-script clean-sh-script clean-python-script
@@ -689,9 +685,9 @@ clean-perl-script:
689685
clean-python-script:
690686
$(RM) $(SCRIPT_PYTHON_GEN)
691687

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) \
695691
git-instaweb
696692

697693
ETAGS_TARGET = TAGS
@@ -2683,7 +2679,6 @@ endif
26832679
test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
26842680

26852681
all:: $(TEST_PROGRAMS) $(test_bindir_programs)
2686-
all:: $(NO_INSTALL)
26872682

26882683
bin-wrappers/%: wrap-for-bin.sh
26892684
@mkdir -p bin-wrappers
@@ -2967,7 +2962,7 @@ rpm::
29672962

29682963
artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
29692964
GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
2970-
$(NO_INSTALL) $(MOFILES)
2965+
$(MOFILES)
29712966
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \
29722967
SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
29732968
test -n "$(ARTIFACTS_DIRECTORY)"
@@ -3016,7 +3011,7 @@ clean: profile-clean coverage-clean cocciclean
30163011
$(RM) $(OBJECTS)
30173012
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
30183013
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
3019-
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
3014+
$(RM) $(TEST_PROGRAMS)
30203015
$(RM) $(FUZZ_PROGRAMS)
30213016
$(RM) -r bin-wrappers $(dep_dirs)
30223017
$(RM) -r po/build/

0 commit comments

Comments
 (0)