Re: bootstrap problem with $build_aux

[Eric Blake]

On 06/21/2013 04:52 PM, Werner LEMBERG wrote:
> 
> [gnulib commit 68f90afdb82204c27a50e7bce169d2b3795a1ddd]
> 
> Folks,
> 
> 
> in my setup for ttfautohint (http://repo.or.cz/w/ttfautohint.git) I
> have the following assignment in `bootstrap.conf':
> 
>   build_aux=gnulib

A bit unusual, since most other packages set it to build-aux.

> 
> It seems that the patch below is necessary to make this really work
> (at least it works for me): if I understand the issue correctly,
> $build_aux is a *destination* variable, so it must not be used for the
> files listed in $gnulib_extra_files which uses the directory structure
> of the `gnulib' repository.

It's probably a correct patch, and you're just the first person using an
atypical $build_aux to expose the need for it.

> 
> 
>     Werner
> 
> 
> ======================================================================
> 
> 
> diff --git a/bootstrap b/bootstrap
> index 0cbea66..31f34b8 100755
> --- a/bootstrap
> +++ b/bootstrap
> @@ -256,12 +256,12 @@ esac
>  # Extra files from gnulib, which override files from other sources.
>  test -z "${gnulib_extra_files}" && \
>    gnulib_extra_files="
> -        $build_aux/install-sh
> -        $build_aux/mdate-sh
> -        $build_aux/texinfo.tex
> -        $build_aux/depcomp
> -        $build_aux/config.guess
> -        $build_aux/config.sub
> +        build-aux/install-sh
> +        build-aux/mdate-sh
> +        build-aux/texinfo.tex
> +        build-aux/depcomp
> +        build-aux/config.guess
> +        build-aux/config.sub
>          doc/INSTALL

The fact that doc is not controlled by a variable suggests that this is
correct.  I'll probably go ahead and apply this, with a better ChangeLog
message.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature