diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:16 +0900 |
| commit | c988f6425acbd9765c55490c45d61f7531d5d83b (patch) | |
| tree | a600743fa8047814636f3263f7b88c8cde11495b | |
| parent | 9bfa0f9be3e718f701200a242ea04259a4dc4dfc (diff) | |
| parent | d8698987f31ddca15bd34291a91f65954d1e3b4a (diff) | |
| download | git-c988f6425acbd9765c55490c45d61f7531d5d83b.tar.gz | |
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
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | contrib/mw-to-git/Makefile | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -2021,6 +2021,9 @@ GIT-PERL-DEFINES: FORCE echo "$$FLAGS" >$@; \ fi +.PHONY: perllibdir +perllibdir: + @echo '$(perllibdir_SQ)' .PHONY: gitweb gitweb: diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile index a4b6f7a2cd..4e603512a3 100644 --- a/contrib/mw-to-git/Makefile +++ b/contrib/mw-to-git/Makefile @@ -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)) |