зеркало из https://github.com/microsoft/git.git
Merge branch 'ab/simplify-perl-makefile'
Recent simplification of build procedure forgot a bit of tweak to the build procedure of contrib/mw-to-git/ * ab/simplify-perl-makefile: Makefile: mark perllibdir as a .PHONY target perl: fix installing modules from contrib
This commit is contained in:
Коммит
c988f6425a
3
Makefile
3
Makefile
|
@ -2021,6 +2021,9 @@ GIT-PERL-DEFINES: FORCE
|
|||
echo "$$FLAGS" >$@; \
|
||||
fi
|
||||
|
||||
.PHONY: perllibdir
|
||||
perllibdir:
|
||||
@echo '$(perllibdir_SQ)'
|
||||
|
||||
.PHONY: gitweb
|
||||
gitweb:
|
||||
|
|
|
@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/
|
|||
INSTALL = install
|
||||
|
||||
SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
|
||||
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
|
||||
-s --no-print-directory instlibdir)
|
||||
INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \
|
||||
-s --no-print-directory prefix=$(prefix) \
|
||||
perllibdir=$(perllibdir) perllibdir)
|
||||
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
|
||||
INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче