From: Christian Hesse <mail@eworm.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: Christian Hesse <mail@eworm.de>
Subject: [PATCH 1/1] perl: fix installing modules from contrib
Date: Tue, 3 Apr 2018 11:20:08 +0200 [thread overview]
Message-ID: <20180403092008.26892-1-mail@eworm.de> (raw)
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.
Signed-off-by: Christian Hesse <mail@eworm.de>
---
Makefile | 2 ++
contrib/mw-to-git/Makefile | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index a1d8775ad..bcaf50495 100644
--- a/Makefile
+++ b/Makefile
@@ -2002,6 +2002,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 a4b6f7a2c..0a6e59579 100644
--- a/contrib/mw-to-git/Makefile
+++ b/contrib/mw-to-git/Makefile
@@ -21,8 +21,8 @@ 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 perllibdir=$(perllibdir) perllibdir)
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
next reply other threads:[~2018-04-03 9:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-03 9:20 Christian Hesse [this message]
2018-04-03 10:49 ` [PATCH 1/1] perl: fix installing modules from contrib Ævar Arnfjörð Bjarmason
2018-04-09 4:54 ` Junio C Hamano
2018-04-10 13:36 ` [PATCH v2 " Christian Hesse
2018-04-10 21:44 ` Junio C Hamano
2018-04-11 6:51 ` [PATCH v3 " Christian Hesse
2018-04-18 21:44 ` Junio C Hamano
2018-04-19 21:44 ` Christian Hesse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180403092008.26892-1-mail@eworm.de \
--to=mail@eworm.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).