From 644c40496cf7d5a705a73c9dd32b035fcecc2ab1 Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Sat, 22 Jun 2013 00:52:22 +0200 Subject: [PATCH 1/1] 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 --- ChangeLog | 6 ++++++ build-aux/bootstrap | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fac6e06ec..deb6b3798 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-07-18 Werner Lemberg (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 tmpdir: fix bug in VMS port diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 9c522049f..a37fb8a03 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 " -- 2.11.0