From cfb3a47cada99d1bdccd08426f122ded2a63834e Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 10 Apr 2018 15:36:41 +0200 Subject: [PATCH] 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)) -- 2.43.2