From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
git@vger.kernel.org, Steffen Prohaska <prohaska@zib.de>,
Jakub Narebski <jnareb@gmail.com>
Subject: Re: [PATCH 0/3] Fix installation paths with "make install-doc"
Date: Tue, 12 Feb 2013 23:00:34 +0000 [thread overview]
Message-ID: <20130212230034.GA22779@river> (raw)
In-Reply-To: <7vmwv9ducx.fsf@alter.siamese.dyndns.org>
On Tue, Feb 12, 2013 at 02:45:34PM -0800, Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
> > John Keeping wrote:
> >
> >> Documentation/Makefile: fix inherited {html,info,man}dir
> >
> > This doesn't seem to have hit the list.
>
> More importantly,
>
> >> When using the top-level install-doc target the html, info and man
> >> target directories are inherited from the top-level Makefile by the
> >> documentation Makefile as relative paths, which is not expected and
> >> results in the files being installed in an unexpected location.
>
> I am not sure what problem it is trying to address. During every
> cycle "make doc && make install-man install-html" is run for all
> integration branches and it didn't cause any problems.
>
> A wild guess. John, are you using config.mak.autogen?
Close - plain config.mak.
I set $prefix there and ran "make install-doc". That installed the man
pages in Documentation/share/man/ in my Git source directory.
> I _think_ exporting mandir/html/infodir from the top-level Makefile
> is wrong to begin with. We should drop the "export mandir" from
> there.
>
> Giving them unusual meaning (e.g. "mandir = share/man") is already
> bad and that needs to be fixed by limiting this "oh, on some
> platforms we compile-in GIT_MAN_PATH as a relative path to an
> unspecified place" insanity only to where -DGIT_MAN_PATH=<path> is
> defined. The path used there does not help the building and
> installation of the documentation at all, so the variable used for
> the purpose of giving that <path> should not be named the same way
> as the variable used on Documentation/Makefile to name the real path
> in the first place.
>
> Perhaps rename these to runtime_{man,html,info}dir or something and
> make sure {man,html,info}dir are defined as the real paths whose
> default values begin with $(prefix)?
Would it be sensible to define the values for these variables (with
absolute paths) in a separate top-level file like config.mak.uname
(defaults.mak maybe?) and include that in both Documentation/Makefile
and Makefile, then calculate the relative path from $(prefix) to
$({man,html,info}dir) for the compiled-in values.
John
prev parent reply other threads:[~2013-02-12 23:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-12 20:17 [PATCH 0/3] Fix installation paths with "make install-doc" John Keeping
2013-02-12 20:17 ` [PATCH 1/3] Documentation/Makefile: fix spaces around assignments John Keeping
2013-02-12 21:00 ` Jonathan Nieder
2013-02-12 20:17 ` [PATCH 2/3] Documentation/Makefile: move infodir to be with other '*dir's John Keeping
2013-02-12 21:01 ` Jonathan Nieder
2013-02-12 21:18 ` John Keeping
2013-02-12 20:17 ` [PATCH 3/3] Documentation/Makefile: fix inherited {html,info,man}dir John Keeping
2013-02-12 22:25 ` [PATCH 0/3] Fix installation paths with "make install-doc" Jonathan Nieder
2013-02-12 22:36 ` John Keeping
2013-02-12 22:39 ` Jonathan Nieder
2013-02-12 22:45 ` Junio C Hamano
2013-02-12 22:57 ` Junio C Hamano
2013-02-12 23:06 ` John Keeping
2013-02-12 23:16 ` Junio C Hamano
2013-02-12 23:09 ` [PATCH] Makefile: do not export mandir/htmldir/infodir Junio C Hamano
2013-02-12 23:16 ` Jonathan Nieder
2013-02-12 23:20 ` John Keeping
2013-02-24 19:55 ` [PATCH] Makefile: make mandir, htmldir and infodir absolute John Keeping
2013-02-25 20:35 ` Junio C Hamano
2013-02-12 23:00 ` John Keeping [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130212230034.GA22779@river \
--to=john@keeping.me.uk \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=jrnieder@gmail.com \
--cc=prohaska@zib.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.
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 NNTP newsgroup(s).