Mercurial > gnulib
changeset 30169:f4ffce9c671f
Oops, tweak last commit so that it also works in the first gnulib-tool run.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Thu, 25 Sep 2008 16:02:58 +0200 |
| parents | ddbaece48218 |
| children | abd61bf1a0be |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 25 14:36:14 2008 +0200 +++ b/ChangeLog Thu Sep 25 16:02:58 2008 +0200 @@ -1,3 +1,8 @@ +2008-09-25 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_import): When computing the edits, consider not + only the Makefile.ams that exist but also those that will be generated. + 2008-09-25 Simon Josefsson <simon@josefsson.org> * modules/sys_select-tests (Depends-on): Remove sys_select itself,
--- a/gnulib-tool Thu Sep 25 14:36:14 2008 +0200 +++ b/gnulib-tool Thu Sep 25 16:02:58 2008 +0200 @@ -2929,12 +2929,19 @@ fi func_note_Makefile_am_edit "" ACLOCAL_AMFLAGS "-I ${m4base}" { - # Find the first parent directory of $m4base that contains a Makefile.am. + # Find the first parent directory of $m4base that contains or will contain + # a Makefile.am. sed_last='s,^.*/\([^/][^/]*\)//*$,\1/, s,//*$,/,' sed_butlast='s,[^/][^/]*//*$,,' dir1="${m4base}/"; dir2="" - while test -n "$dir1" && test ! -f "${destdir}/${dir1}Makefile.am"; do + while test -n "$dir1" \ + && ! { test -f "${destdir}/${dir1}Makefile.am" \ + || test "${dir1}Makefile.am" = "$sourcebase/$makefile_am" \ + || test "./${dir1}Makefile.am" = "$sourcebase/$makefile_am" \ + || { test -n "$inctests" \ + && { test "${dir1}Makefile.am" = "$testsbase/$makefile_am" \ + || test "./${dir1}Makefile.am" = "$testsbase/$makefile_am"; }; }; }; do dir2=`echo "$dir1" | sed -e "$sed_last"`"$dir2" dir1=`echo "$dir1" | sed -e "$sed_butlast"` done