summaryrefslogtreecommitdiff
path: root/contrib/mw-to-git
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2018-04-10 13:36:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-11 01:29:03 (GMT)
commitcfb3a47cada99d1bdccd08426f122ded2a63834e (patch)
treea832ce00994709926f9c800c7cebf93376afb80e /contrib/mw-to-git
parent2530afd3519a34b66e72cc29e7751d650cedc6dd (diff)
downloadgit-cfb3a47cada99d1bdccd08426f122ded2a63834e.zip
git-cfb3a47cada99d1bdccd08426f122ded2a63834e.tar.gz
git-cfb3a47cada99d1bdccd08426f122ded2a63834e.tar.bz2
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>
Diffstat (limited to 'contrib/mw-to-git')
-rw-r--r--contrib/mw-to-git/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
index a4b6f7a..4e60351 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))