diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | autogen/README | 12 | ||||
| -rwxr-xr-x | autogen/copy_autogen | 2 | ||||
| -rwxr-xr-x | autogen/update_autogen | 6 |
4 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index de89768c0a2..905562bff24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2011-07-29 Paul Eggert <eggert@cs.ucla.edu> Merge from gnulib, using build-aux to remove clutter (Bug#9169). + * autogen/README: Update destination list. + * autogen/copy_autogen, autogen/update_autogen, .bzrignore: + The autogenerated files compile, config.guess, + config.sub, depcomp, install-sh, and missing are now in build-aux. * m4/largefile.m4: New file, so that Emacs does not mess up when accessing files with large inode numbers in MacOS X 10.5 and later. * m4/nocrash.m4: New file, to avoid triggering background debugger @@ -10,8 +14,6 @@ * build-aux/snippet/c++defs.h: Renamed from c++defs.h. * build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h. * build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn. - * .bzrignore: The autogenerated files compile, config.guess, - config.sub, depcomp, install-sh, and missing are now in build-aux. * Makefile.in (epaths-force, sync-from-gnulib): move-if-change is now in build-aux. (GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite diff --git a/autogen/README b/autogen/README index fd574c41cd6..d4c2236581b 100644 --- a/autogen/README +++ b/autogen/README @@ -7,12 +7,12 @@ configure ../ autoconf config.in ../src autoheader * also used by MSDOS bzr build aclocal.m4 ../ aclocal Makefile.in ../lib automake -compile ../ automake -config.guess ../ automake -config.sub ../ automake -depcomp ../ automake -install-sh ../ automake -missing ../ automake +compile ../build-aux automake +config.guess ../build-aux automake +config.sub ../build-aux automake +depcomp ../build-aux automake +install-sh ../build-aux automake +missing ../build-aux automake There are also some scripts: diff --git a/autogen/copy_autogen b/autogen/copy_autogen index a0daf9f02e5..c9f04ad6253 100755 --- a/autogen/copy_autogen +++ b/autogen/copy_autogen @@ -16,7 +16,7 @@ if test ! -e config.in; then fi ## Order implied by top-level Makefile's rules, for time-stamps. -cp compile config.guess config.sub depcomp install-sh missing ../ +cp compile config.guess config.sub depcomp install-sh missing ../build-aux cp aclocal.m4 ../ cp configure ../ touch ../src/stamp-h.in diff --git a/autogen/update_autogen b/autogen/update_autogen index c134609356c..e406f346ede 100755 --- a/autogen/update_autogen +++ b/autogen/update_autogen @@ -80,7 +80,11 @@ lboot_flag= ldefs_in=lisp/loaddefs.el ldefs_out=lisp/ldefs-boot.el sources="configure.in lib/Makefile.am" -genfiles="configure aclocal.m4 src/config.in lib/Makefile.in compile config.guess config.sub depcomp install-sh missing" +genfiles=" + configure aclocal.m4 src/config.in lib/Makefile.in + build-aux/compile build-aux/config.guess build-aux/config.sub + build-aux/depcomp build-aux/install-sh build-aux/missing +" for g in $genfiles; do basegen="$basegen ${g##*/}" |