git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Tim Visher <tim.visher@gmail.com>,
	Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH] autoconf: Add support for --infodir
Date: Sat, 28 Feb 2009 01:33:29 +0100	[thread overview]
Message-ID: <20090228002550.22597.53878.stgit@localhost.localdomain> (raw)
In-Reply-To: <Tim Visher <tim.visher@gmail.com>

On Thu, 26 Feb 2009, Jeff King wrote:
> On Thu, Feb 26, 2009 at 09:48:29AM -0500, Tim Visher wrote:
> 
>> I'm working on getting git 1.6.2-rc2 built.  I have a bin, man, info,
>> and html directory in my home folder that I'd like to use as the
>> defaults for git.  I attempted to do this through
>> 
>>     make configure
>>     ./configure --XXdir=/full/path/to/dir
>>     make all man info html
>>     make install install-man install-info install-html
>> 
>> But other than the binaries (and I'm not even totally convinced they
>> got in correctly) and the man pages, everything else seems to be
>> attempting to go to the typical places in /usr/local.
>> 
>> What am I doing wrong?

Why don't you use simply --prefix=DIR?

> 
> The configure support is notoriously incomplete (AFAIK, very few of the
> active developers use it regularly). Probably you need something like
> this (but I didn't test it):
> 
> diff --git a/config.mak.in b/config.mak.in
> index 7cce0c1..505d5c7 100644
> --- a/config.mak.in
> +++ b/config.mak.in
> @@ -18,6 +18,8 @@ datarootdir = @datarootdir@
>  template_dir = @datadir@/git-core/templates
>  
>  mandir=@mandir@
> +htmldir=@htmldir@
> +infodir=@infodir@
>  
>  srcdir = @srcdir@
>  VPATH = @srcdir@

Well, the infodir part works trivially, because autoconf (and
therefore ./configure script) has support for --infodir=DIR.
Below there is patch that adds that, with the commit message.

But it is more difficult with respect to --htmldir. I am not autoconf
hacker, so I don't know how to add support for having --htmldir=DIR in
./configure (in configure.ac).  What can be done is to derive htmldir
in config.mak.in from other sources, for example:

  htmldir=@datadir@/doc/git

or something like that.

-- >8 --
Now that we actually (can) install some info files, and that $infodir
is set and used in Makefile(s), let add support for --infodir=DIR
[PREFIX/info] ./configure option in config.mak.in.

Half of patch by Jeff King <peff@peff.net>m adding --XXdir support 
(the easy part: autoconf has --infodir, but not --htmldir).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
 config.mak.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/config.mak.in b/config.mak.in
index 7cce0c1..acff9ed 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -18,6 +18,7 @@ datarootdir = @datarootdir@
 template_dir = @datadir@/git-core/templates
 
 mandir=@mandir@
+infodir=@infodir@
 
 srcdir = @srcdir@
 VPATH = @srcdir@

       reply	other threads:[~2009-02-28  0:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <Tim Visher <tim.visher@gmail.com>
2009-02-28  0:33 ` Jakub Narebski [this message]
2009-02-28  0:45   ` [PATCH] autoconf: Add support for --infodir Jakub Narebski
2009-02-28  1:15   ` David Syzdek
     [not found]   ` <9a0027270902271712y57839e22w492f7ad46baf49b@mail.gmail.com>
2009-02-28  1:57     ` Jakub Narebski

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=20090228002550.22597.53878.stgit@localhost.localdomain \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=tim.visher@gmail.com \
    /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).