From cfb3a47cada99d1bdccd08426f122ded2a63834e Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 10 Apr 2018 15:36:41 +0200 Subject: [PATCH 1/2] perl: fix installing modules from contrib Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) removed a target that allowed Makefiles from contrib/ to get the correct install path. This introduces a new target for main Makefile and fixes installation for Mediawiki module. v2: Pass prefix as that can have influence as well, add single quotes for _SQ variant. Signed-off-by: Christian Hesse --- Makefile | 2 ++ contrib/mw-to-git/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2091f5f892..75b9ad3b48 100644 --- a/Makefile +++ b/Makefile @@ -1973,6 +1973,8 @@ GIT-PERL-DEFINES: FORCE echo "$$FLAGS" >$@; \ fi +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)) From d8698987f31ddca15bd34291a91f65954d1e3b4a Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 19 Apr 2018 06:44:40 +0900 Subject: [PATCH 2/2] Makefile: mark perllibdir as a .PHONY target This target should be marked as .PHONY, just like other targets that exist only for their side effects that do not create filesystem entities with the same name. Signed-off-by: Christian Hesse Signed-off-by: Junio C Hamano --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 75b9ad3b48..b284eb20aa 100644 --- a/Makefile +++ b/Makefile @@ -1973,6 +1973,7 @@ GIT-PERL-DEFINES: FORCE echo "$$FLAGS" >$@; \ fi +.PHONY: perllibdir perllibdir: @echo '$(perllibdir_SQ)'