# [PATCH] autoconf: Add support for --infodir 4 messages from 2009-02-28 to 2009-02-28. Participants: Jakub Narebski, David Syzdek. Thread: https://gitlist.dev/t/18053 ## Jakub Narebski, 2009-02-28 00:33 Subject: [PATCH] autoconf: Add support for --infodir Message-ID: <20090228002550.22597.53878.stgit@localhost.localdomain> URL: https://gitlist.dev/e/20090228002550.22597.53878.stgit%40localhost.localdomain In-Reply-To: ``` 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 m adding --XXdir support (the easy part: autoconf has --infodir, but not --htmldir). Signed-off-by: Jakub Narebski --- 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@ ``` ## Jakub Narebski, 2009-02-28 00:45 Subject: Re: [PATCH] autoconf: Add support for --infodir Message-ID: URL: https://gitlist.dev/e/m3d4d3v195.fsf%40localhost.localdomain In-Reply-To: <20090228002550.22597.53878.stgit@localhost.localdomain> ``` Gaah, this was meant to be reply to message by Peff Message-ID: <20090226150013.GA9785@coredump.intra.peff.net> in the "`./configure --XXdir=` ignored?" thread, but I mis-pasted reply-to id. Jakub Narebski writes: > -- >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 m adding --XXdir support That was of course meant to be s/>m/>,/ Half of patch by Jeff King , adding --XXdir support [...] -- Jakub Narebski Poland ShadeHawk on #git ``` ## David Syzdek, 2009-02-28 01:15 Subject: Re: [PATCH] autoconf: Add support for --infodir Message-ID: <9a0027270902271715w3f72e01dp4e1e3a716b92527c@mail.gmail.com> URL: https://gitlist.dev/e/9a0027270902271715w3f72e01dp4e1e3a716b92527c%40mail.gmail.com In-Reply-To: <20090228002550.22597.53878.stgit@localhost.localdomain> ``` On Fri, Feb 27, 2009 at 3:33 PM, Jakub Narebski wrote: > > 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: > Autoconf add support for --htmldir in version 2.60. Here is a snippet from the help message from a configure script generated with 2.60: --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] --docdir=DIR documentation root [DATAROOTDIR/doc/PROJECT_TARNAME] --htmldir=DIR html documentation [DOCDIR] The current configure.ac requires autoconf version >= 2.59, bumping the requirement to autoconf >= 2.60 would allow the autoconf variable $(htmldir) to be used. Bumping the required version of autoconf will affect users with older linux installations who use git to upgrade git; and may affect the maintainer's ability to create a "release" tarball if he has an older version of autoconf. >  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 m adding --XXdir support > (the easy part: autoconf has --infodir, but not --htmldir). > > Signed-off-by: Jakub Narebski > --- >  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@ > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at  http://vger.kernel.org/majordomo-info.html -- An earthquake wiped out Etchisketchistan today.   -- Onion TV ``` ## Jakub Narebski, 2009-02-28 01:57 Subject: Re: [PATCH] autoconf: Add support for --infodir Message-ID: <200902280257.56932.jnareb@gmail.com> URL: https://gitlist.dev/e/200902280257.56932.jnareb%40gmail.com In-Reply-To: <9a0027270902271712y57839e22w492f7ad46baf49b@mail.gmail.com> ``` On Sat, 28 Feb 2009, David Syzdek wrote: > On Fri, Feb 27, 2009 at 3:33 PM, Jakub Narebski wrote: >> 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 [...] >>> 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: > > Autoconf add support for --htmldir in version 2.60. Here is a snippet from > the help message from a configure script generated with 2.60: > > --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] > > --docdir=DIR documentation root [DATAROOTDIR/doc/PROJECT_TARNAME] > > --htmldir=DIR html documentation [DOCDIR] > > > The current configure.ac requires autoconf version>= 2.59, bumping the > requirement to autoconf>= 2.60 would allow the autoconf variable $(htmldir) > to be used. Bumping the required version of autoconf will affect users with > older linux installations who use git to upgrade git; and may affect the > maintainer's ability to create a "release" tarball if he has an older > version of autoconf. Well, I have autoconf 2.59, so I cannot test the following patch (and I am not sure if it is welcome). And of course it needs commit message, at least with explanation why bumping required version of autoconf was needed. -- >8 -- diff --git a/config.mak.in b/config.mak.in index acff9ed..56a0147 100644 --- a/config.mak.in +++ b/config.mak.in @@ -19,6 +19,7 @@ template_dir = @datadir@/git-core/templates mandir=@mandir@ infodir=@infodir@ +htmldir=@htmldir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/configure.ac b/configure.ac index 082a03d..b1ab0e1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.59) +AC_PREREQ(2.60) AC_INIT([git], [@@GIT_VERSION@@], [git@vger.kernel.org]) AC_CONFIG_SRCDIR([git.c]) -- Jakub Narebski Poland ```