Skip to content

Commit cfb3a47

Browse files
eworm-degitster
authored andcommitted
perl: fix installing modules from contrib
Commit 20d2a30 (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 <[email protected]>
1 parent 2530afd commit cfb3a47

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,6 +1973,8 @@ GIT-PERL-DEFINES: FORCE
19731973
echo "$$FLAGS" >$@; \
19741974
fi
19751975

1976+
perllibdir:
1977+
@echo '$(perllibdir_SQ)'
19761978

19771979
.PHONY: gitweb
19781980
gitweb:

contrib/mw-to-git/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/
2121
INSTALL = install
2222

2323
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)
2627
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
2728
INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
2829

0 commit comments

Comments
 (0)