From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Christian Hesse <mail@eworm.de>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Dan Jacques <dnj@chromium.org>
Subject: Re: [PATCH 1/1] perl: fix installing modules from contrib
Date: Tue, 03 Apr 2018 12:49:47 +0200 [thread overview]
Message-ID: <87tvssva2c.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20180403092008.26892-1-mail@eworm.de>
On Tue, Apr 03 2018, Christian Hesse wrote:
> 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))
Thanks, I (obviously) missed that when getting rid of the perl/Makefile.
This fixes it up for now, but it seems we're going to need some solution
to make this work with the in-flight RUNTIME_PREFIX Dan's been working
on.
I think the best solution for that, not just for this but for most of
contrib/ in general, is to simply move it into our main tree out of
contrib/, and introduce some Makefile flags for whether or not you'd
want to install such-and-such from contrib.
That would probably be easier than the current arrangement, and we could
do things like say we always want to run tests for contrib/ stuff, even
though we're not installing it.
next prev parent reply other threads:[~2018-04-03 10:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-03 9:20 [PATCH 1/1] perl: fix installing modules from contrib Christian Hesse
2018-04-03 10:49 ` Ævar Arnfjörð Bjarmason [this message]
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=87tvssva2c.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=dnj@chromium.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mail@eworm.de \
/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).