Skip to content

Commit c988f64

Browse files
committed
Merge branch 'ab/simplify-perl-makefile'
Recent simplification of build procedure forgot a bit of tweak to the build procedure of contrib/mw-to-git/ * ab/simplify-perl-makefile: Makefile: mark perllibdir as a .PHONY target perl: fix installing modules from contrib
2 parents 9bfa0f9 + d869898 commit c988f64

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,6 +2021,9 @@ GIT-PERL-DEFINES: FORCE
20212021
echo "$$FLAGS" >$@; \
20222022
fi
20232023

2024+
.PHONY: perllibdir
2025+
perllibdir:
2026+
@echo '$(perllibdir_SQ)'
20242027

20252028
.PHONY: gitweb
20262029
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)