kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Johannes Schindelin 2019-04-18 06:16:39 -07:00 committed by Junio C Hamano
parent 5afb2ce4cd
commit 0b64e21cc2
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -661,10 +661,6 @@ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))


SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))

# Individual rules to allow e.g. # Individual rules to allow e.g.
# "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script" # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
# from subdirectories like contrib/*/ # from subdirectories like contrib/*/
@ -674,11 +670,11 @@ build-sh-script: $(SCRIPT_SH_GEN)
build-python-script: $(SCRIPT_PYTHON_GEN) build-python-script: $(SCRIPT_PYTHON_GEN)


.PHONY: install-perl-script install-sh-script install-python-script .PHONY: install-perl-script install-sh-script install-python-script
install-sh-script: $(SCRIPT_SH_INS) install-sh-script: $(SCRIPT_SH_GEN)
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
install-perl-script: $(SCRIPT_PERL_INS) install-perl-script: $(SCRIPT_PERL_GEN)
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
install-python-script: $(SCRIPT_PYTHON_INS) install-python-script: $(SCRIPT_PYTHON_GEN)
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'


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


SCRIPTS = $(SCRIPT_SH_INS) \ SCRIPTS = $(SCRIPT_SH_GEN) \
$(SCRIPT_PERL_INS) \ $(SCRIPT_PERL_GEN) \
$(SCRIPT_PYTHON_INS) \ $(SCRIPT_PYTHON_GEN) \
git-instaweb git-instaweb


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


all:: $(TEST_PROGRAMS) $(test_bindir_programs) all:: $(TEST_PROGRAMS) $(test_bindir_programs)
all:: $(NO_INSTALL)


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


artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \ artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \ GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
$(NO_INSTALL) $(MOFILES) $(MOFILES)
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \ $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \
SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)' SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
test -n "$(ARTIFACTS_DIRECTORY)" test -n "$(ARTIFACTS_DIRECTORY)"
@ -3016,7 +3011,7 @@ clean: profile-clean coverage-clean cocciclean
$(RM) $(OBJECTS) $(RM) $(OBJECTS)
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB) $(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL) $(RM) $(TEST_PROGRAMS)
$(RM) $(FUZZ_PROGRAMS) $(RM) $(FUZZ_PROGRAMS)
$(RM) -r bin-wrappers $(dep_dirs) $(RM) -r bin-wrappers $(dep_dirs)
$(RM) -r po/build/ $(RM) -r po/build/