Re: [PATCH] autoconf: Add support for --infodir

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, Feb 27, 2009 at 3:33 PM, Jakub Narebski <jnareb@xxxxxxxxx> 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 <peff@xxxxxxxx>m adding --XXdir support
> (the easy part: autoconf has --infodir, but not --htmldir).
>
> Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
> ---
>  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@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



--
An earthquake wiped out Etchisketchistan today.
  -- Onion TV
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux