Mercurial > gnulib
changeset 29174:a9281f205548
Pull my changes from coreutils:
bootstrap: fix typo to enable use of $gnulib_tool_option_extras.
* build-aux/bootstrap (gnulib_tool_options): Add a space before the
use of $gnulib_tool_option_extras, so that it's separated from the
preceding argument.
Fix bootstrap failure to handle files like lib/uniwidth/cjk.h.
* build-aux/bootstrap (cp_mark_as_generated): Create any required
parent destination directories before copying a file into place.
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Sun, 18 Nov 2007 11:51:26 +0100 |
parents | eda839313dbd |
children | a9f6931419d9 |
files | ChangeLog build-aux/bootstrap |
diffstat | 2 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Nov 18 11:42:16 2007 +0100 +++ b/ChangeLog Sun Nov 18 11:51:26 2007 +0100 @@ -1,3 +1,15 @@ +2007-11-18 Jim Meyering <meyering@redhat.com> + + Pull my changes from coreutils: + bootstrap: fix typo to enable use of $gnulib_tool_option_extras. + * build-aux/bootstrap (gnulib_tool_options): Add a space before the + use of $gnulib_tool_option_extras, so that it's separated from the + preceding argument. + + Fix bootstrap failure to handle files like lib/uniwidth/cjk.h. + * build-aux/bootstrap (cp_mark_as_generated): Create any required + parent destination directories before copying a file into place. + 2007-11-18 Sergey Poznyakoff <gray@gnu.org.ua> bootstrap: work also with 4-argument variant of AC_INIT
--- a/build-aux/bootstrap Sun Nov 18 11:42:16 2007 +0100 +++ b/build-aux/bootstrap Sun Nov 18 11:51:26 2007 +0100 @@ -367,6 +367,11 @@ *) c1= ; c2= ;; esac + # If the destination directory doesn't exist, create it. + # This is required at least for "lib/uniwidth/cjk.h". + dst_dir=`dirname "$cp_dst"` + test -d "$dst_dir" || mkdir -p "$dst_dir" + if test -z "$c1"; then cmp -s "$cp_src" "$cp_dst" || { echo "$0: cp -f $cp_src $cp_dst" && @@ -488,7 +493,7 @@ --source-base $bt/lib/\ --tests-base $bt/tests\ --local-dir $local_gl_dir\ -$gnulib_tool_option_extras\ + $gnulib_tool_option_extras\ " echo "$0: $gnulib_tool $gnulib_tool_options --import ..." $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&