Mercurial > hg > octave-kai > gnulib-hg
changeset 17453:d6a1c46258ab
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>
| author | Werner LEMBERG <wl@gnu.org> |
|---|---|
| date | Sat, 22 Jun 2013 00:52:22 +0200 |
| parents | 0fa92a6e12b9 |
| children | 9b8de09b2e2e |
| files | ChangeLog build-aux/bootstrap |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-07-18 Werner Lemberg <wl@gnu.org> (tiny change) + + bootstrap: use correct source when copying build-aux files + * build-aux/bootstrap (gnulib_extra_files): This variable is + relative to upstream gnulib layout, not downstream. + 2013-07-17 Paul Eggert <eggert@cs.ucla.edu> tmpdir: fix bug in VMS port
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -256,12 +256,12 @@ # 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 "