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 <mail@eworm.de>
Christian Hesse committed
Apr 10, 2018 at 15:36 UTC
cfb3a47cada99d1bdccd08426f122ded2a63834e
2 files changed
+5
-2
Makefile
+2
@@ -1973,6 +1973,8 @@ GIT-PERL-DEFINES: FORCE
1973
echo "$$FLAGS" >$@; \
1974
fi
1975
1976
+perllibdir:
1977
+ @echo '$(perllibdir_SQ)'
1978
1979
.PHONY: gitweb
1980
gitweb:
contrib/mw-to-git/Makefile
+3
-2
@@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/
21
INSTALL = install
22
23
SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
24
-INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
25
- -s --no-print-directory instlibdir)
24
+INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \
25
+ -s --no-print-directory prefix=$(prefix) \
26
+ perllibdir=$(perllibdir) perllibdir)
27
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
28
INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
29