diff options
| author | Werner LEMBERG <wl@gnu.org> | 2013-06-22 00:52:22 +0200 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2013-07-18 14:49:34 -0600 |
| commit | 644c40496cf7d5a705a73c9dd32b035fcecc2ab1 (patch) | |
| tree | d3b2ec0cc04151e422eeb2fa86a334c3da35e3df /build-aux/bootstrap | |
| parent | 312af25ba220ccff068245f0dc698e9bcc8f03f8 (diff) | |
| download | gnulib-644c40496cf7d5a705a73c9dd32b035fcecc2ab1.tar.gz | |
bootstrap: use correct source when copying build-aux files
in my setup for ttfautohint (http://repo.or.cz/w/ttfautohint.git) I
have the following assignment in `bootstrap.conf':
build_aux=gnulib
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.
* build-aux/bootstrap (gnulib_extra_files): This variable is
relative to upstream gnulib layout, not downstream.
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'build-aux/bootstrap')
| -rwxr-xr-x | build-aux/bootstrap | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 9c522049f0..a37fb8a039 100755 --- a/build-aux/bootstrap +++ b/build-aux/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 " |