[PATCH] autoconf: Add support for --infodir
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Feb 28, 2009, 00:33 UTC
- Message-ID
- <20090228002550.22597.53878.stgit@localhost.localdomain>
- In-Reply-To
- <tim.visher@gmail.com>
On Thu, 26 Feb 2009, Jeff King wrote:
Show 16 quoted lines
> 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?
Show 18 quoted lines
> > 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@