Renamed config/ to build-aux/.

diff --git a/ChangeLog b/ChangeLog
index 7b1d0a42e5a714d145cd15d3bcc54eae1efd13c7..d28fd525bca6b0eb308164e763efeb34e81bfe85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-22  Bruno Haible  <bruno@clisp.org>
+
+       * m4: New directory, renamed from config/m4/.
+       * build-aux: New directory, renamed from config/.
+       * Makefile.am (EXTRA_DIST): Update.
+
 2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.

diff --git a/Makefile.am b/Makefile.am
index d99d8bc70a9b13e291cbee15ba2de80f0e3fe81c..68e94af87af320cfc91fa2e0fdcd5a1073fdbecd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,10 +23,10 @@ SUBDIRS = autoconf-lib-link gettext-runtime gettext-tools
 
 EXTRA_DIST = \
   version.sh PACKAGING ChangeLog.0 autogen.sh \
-  config/config.libpath config/reloc-ldflags config/install-reloc \
-  config/ac-help.sed \
-  config/m4/fixautomake.m4 \
-  config/m4/libtool.m4
+  build-aux/config.libpath build-aux/reloc-ldflags build-aux/install-reloc \
+  build-aux/ac-help.sed \
+  m4/fixautomake.m4 \
+  m4/libtool.m4
 
 # Additional dependencies for configure, due to the use of autoconf --trace.
 $(srcdir)/configure: $(srcdir)/autoconf-lib-link/configure.ac $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-tools/configure.ac 

diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog
index f301f7109db01ad46bc75607863c6d371c3aac88..f76e65feb2717bea64a65ec5efb1ecb3d4007401 100644 (file)
--- a/autoconf-lib-link/ChangeLog
+++ b/autoconf-lib-link/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-22  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am: Replace config/m4 with m4 and config/ with build-aux/.
+       (build-aux-dir): Renamed from config-dir.
+
 2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.

diff --git a/autoconf-lib-link/Makefile.am b/autoconf-lib-link/Makefile.am
index 6e412754fa00e0fe5900e2e8cc6e0351465a6d23..7cbc07edb4665043fd303dd7dc5f9efa44946cef 100644 (file)
--- a/autoconf-lib-link/Makefile.am
+++ b/autoconf-lib-link/Makefile.am
@@ -18,7 +18,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
-ACLOCAL_AMFLAGS = -I m4 -I ../config/m4
+ACLOCAL_AMFLAGS = -I m4 -I ../m4
 EXTRA_DIST =
 DISTCLEANFILES =
 
@@ -30,10 +30,10 @@ EXTRA_DIST += config.rpath
 # We want to maintain only one copy of config.rpath. The one in this directory
 # is the source.
 
-all-local: $(srcdir)/../config/config.rpath
+all-local: $(srcdir)/../build-aux/config.rpath
 
-$(srcdir)/../config/config.rpath: $(srcdir)/config.rpath
-       cp $(srcdir)/config.rpath $(srcdir)/../config/config.rpath
+$(srcdir)/../build-aux/config.rpath: $(srcdir)/config.rpath
+       cp $(srcdir)/config.rpath $(srcdir)/../build-aux/config.rpath
 
 
 # The AC_CONFIG_AUX_DIR argument in the tests/rpath*/configure.ac files is
@@ -42,40 +42,40 @@ $(srcdir)/../config/config.rpath: $(srcdir)/config.rpath
 #      SRCDIR/tests/rpath*/,
 #   2. at "make check" time, when the directory is copied and configured,
 #      relative to BUILDDIR/tests/tstdir/rp-*/.
-# We choose this argument to be '../../../config', for case 1, and therefore
-# we need to make a local copy of the config directory, for case 2.
+# We choose this argument to be '../../../build-aux', for case 1, and therefore
+# we need to make a local copy of the build-aux directory, for case 2.
 
-all-local: config/config.guess config/config.sub config/install-sh config/ltmain.sh config/mkinstalldirs config/missing config/config.rpath
+all-local: build-aux/config.guess build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh build-aux/mkinstalldirs build-aux/missing build-aux/config.rpath
 
-config-dir:
-       test -d config || mkdir config
-       touch config-dir
+build-aux-dir:
+       test -d build-aux || mkdir build-aux
+       touch build-aux-dir
 
-config/config.guess: $(srcdir)/../config/config.guess config-dir
-       cp $(srcdir)/../config/config.guess config/config.guess
+build-aux/config.guess: $(srcdir)/../build-aux/config.guess build-aux-dir
+       cp $(srcdir)/../build-aux/config.guess build-aux/config.guess
 
-config/config.sub: $(srcdir)/../config/config.sub config-dir
-       cp $(srcdir)/../config/config.sub config/config.sub
+build-aux/config.sub: $(srcdir)/../build-aux/config.sub build-aux-dir
+       cp $(srcdir)/../build-aux/config.sub build-aux/config.sub
 
-config/install-sh: $(srcdir)/../config/install-sh config-dir
-       cp $(srcdir)/../config/install-sh config/install-sh
+build-aux/install-sh: $(srcdir)/../build-aux/install-sh build-aux-dir
+       cp $(srcdir)/../build-aux/install-sh build-aux/install-sh
 
-config/ltmain.sh: $(srcdir)/../config/ltmain.sh config-dir
-       cp $(srcdir)/../config/ltmain.sh config/ltmain.sh
+build-aux/ltmain.sh: $(srcdir)/../build-aux/ltmain.sh build-aux-dir
+       cp $(srcdir)/../build-aux/ltmain.sh build-aux/ltmain.sh
 
-config/mkinstalldirs: $(srcdir)/../config/mkinstalldirs config-dir
-       cp $(srcdir)/../config/mkinstalldirs config/mkinstalldirs
+build-aux/mkinstalldirs: $(srcdir)/../build-aux/mkinstalldirs build-aux-dir
+       cp $(srcdir)/../build-aux/mkinstalldirs build-aux/mkinstalldirs
 
-config/missing: $(srcdir)/../config/missing config-dir
-       cp $(srcdir)/../config/missing config/missing
+build-aux/missing: $(srcdir)/../build-aux/missing build-aux-dir
+       cp $(srcdir)/../build-aux/missing build-aux/missing
 
-config/config.rpath: $(srcdir)/config.rpath config-dir
-       cp $(srcdir)/config.rpath config/config.rpath
+build-aux/config.rpath: $(srcdir)/config.rpath build-aux-dir
+       cp $(srcdir)/config.rpath build-aux/config.rpath
 
-DISTCLEANFILES += config/config.guess config/config.sub config/install-sh config/ltmain.sh config/mkinstalldirs config/missing config/config.rpath
+DISTCLEANFILES += build-aux/config.guess build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh build-aux/mkinstalldirs build-aux/missing build-aux/config.rpath
 
 distclean-local:
-       rm -rf config config-dir
+       rm -rf build-aux build-aux-dir
 
 
 # Subdirectories with separate autoconfiguration.
@@ -83,24 +83,24 @@ distclean-local:
 CONFIGURES_RPATHX = $(srcdir)/tests/rpathx/Makefile.in $(srcdir)/tests/rpathx/aclocal.m4 $(srcdir)/tests/rpathx/configure
 $(srcdir)/tests/rpathx/Makefile.in: $(srcdir)/tests/rpathx/Makefile.am $(srcdir)/tests/rpathx/configure.ac $(srcdir)/tests/rpathx/aclocal.m4
        cd $(srcdir)/tests/rpathx && automake Makefile
-$(srcdir)/tests/rpathx/aclocal.m4: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/../config/m4/libtool.m4
-       cd $(srcdir)/tests/rpathx && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../config/m4 && pwd`
+$(srcdir)/tests/rpathx/aclocal.m4: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/../m4/libtool.m4
+       cd $(srcdir)/tests/rpathx && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd`
 $(srcdir)/tests/rpathx/configure: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/tests/rpathx/aclocal.m4
        cd $(srcdir)/tests/rpathx && autoconf
 
 CONFIGURES_RPATHY = $(srcdir)/tests/rpathy/Makefile.in $(srcdir)/tests/rpathy/aclocal.m4 $(srcdir)/tests/rpathy/configure
 $(srcdir)/tests/rpathy/Makefile.in: $(srcdir)/tests/rpathy/Makefile.am $(srcdir)/tests/rpathy/configure.ac $(srcdir)/tests/rpathy/aclocal.m4
        cd $(srcdir)/tests/rpathy && automake Makefile
-$(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/../config/m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
-       cd $(srcdir)/tests/rpathy && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../config/m4 && pwd`
+$(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/../m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+       cd $(srcdir)/tests/rpathy && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd`
 $(srcdir)/tests/rpathy/configure: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/tests/rpathy/aclocal.m4
        cd $(srcdir)/tests/rpathy && autoconf
 
 CONFIGURES_RPATHZ = $(srcdir)/tests/rpathz/Makefile.in $(srcdir)/tests/rpathz/aclocal.m4 $(srcdir)/tests/rpathz/configure
 $(srcdir)/tests/rpathz/Makefile.in: $(srcdir)/tests/rpathz/Makefile.am $(srcdir)/tests/rpathz/configure.ac $(srcdir)/tests/rpathz/aclocal.m4
        cd $(srcdir)/tests/rpathz && automake Makefile
-$(srcdir)/tests/rpathz/aclocal.m4: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/../config/m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
-       cd $(srcdir)/tests/rpathz && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../config/m4 && pwd`
+$(srcdir)/tests/rpathz/aclocal.m4: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/../m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4
+       cd $(srcdir)/tests/rpathz && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../m4 && pwd`
 $(srcdir)/tests/rpathz/configure: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/tests/rpathz/aclocal.m4
        cd $(srcdir)/tests/rpathz && autoconf
 

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 046c5813a3de28bb6b8d3a02bd11ed1fa2615c53..7c4a513e15ed012d1ff44f9e0b6706d6ba4fd564 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-22  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Replace config/m4 with m4.
+
 2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 23f10e03621b1300b488807b8f1b666fc5b7f86f..f8fd3b72ce1b1bb65f53a29ae2c1fd339570cec2 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -18,7 +18,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
-ACLOCAL_AMFLAGS = -I m4 -I ../gettext-tools/m4 -I ../autoconf-lib-link/m4 -I ../config/m4
+ACLOCAL_AMFLAGS = -I m4 -I ../gettext-tools/m4 -I ../autoconf-lib-link/m4 -I ../m4
 
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
 

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index bda1d7ad415222b4b76591b89072978eba5e766b..ad3639159a75da7d47257ee554dfa390ac1304ce 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-22  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Replace config/m4 with m4.
+
 2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.

diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index 7a0bb4361a275dab6d73c57c1f88acb61f5b630c..7246cd17f7227bf7ddc4954a9f425d88bd954dc9 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -19,7 +19,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
-ACLOCAL_AMFLAGS = -I ../../config/m4 -I ../m4
+ACLOCAL_AMFLAGS = -I ../../m4 -I ../m4
 EXTRA_DIST =
 MOSTLYCLEANFILES =
 

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index d07bbf75ee3d481ece61471b063b9d1994ece8ea..4f2fc006305dc0f4670f7172b01260cc1b72ae2f 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-22  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (ACLOCAL_AMFLAGS): Replace config/m4 with m4.
+       (gettextsrc_SCRIPTS): Replace config with build-aux.
+
 2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.

diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index a78b9ab63a67629a71a15414740a2f997542e2ab..eed38559676d6fb729ca1fe51a540404e3ba0d56 100644 (file)
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -18,7 +18,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
-ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../config/m4
+ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4
 
 SUBDIRS = doc intl lib libgrep libuniname src po projects misc man m4 tests examples
 
@@ -28,7 +28,7 @@ EXTRA_DIST = misc/DISCLAIM
 # Files installed for use by gettextize.
 
 gettextsrcdir = $(datadir)/gettext
-gettextsrc_SCRIPTS = ../autoconf-lib-link/config.rpath ../config/mkinstalldirs
+gettextsrc_SCRIPTS = ../autoconf-lib-link/config.rpath ../build-aux/mkinstalldirs
 
 
 # Files copied from other directories.

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 2c5668ac61e3b55bd40cb93a221e469685f72fcb..1828ccd38019a899a26c5d117dac81383b97b58d 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-22  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (stamp-vti): Replace config with build-aux.
+
 2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.

diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 432ad2694f03a44800643b41fe1b3878a9389088..b7e62d8e3c3499cea5293b74c20339c378ec7877 100644 (file)
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -69,7 +69,7 @@ iso-3166.texi: ISO_3166 iso-3166.sed
 # by automake.
 $(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh
        (dir=.; test -f ./gettext.texi || dir=$(srcdir); \
-       set `$(SHELL) $(top_srcdir)/../config/mdate-sh $$dir/gettext.texi`; \
+       set `$(SHELL) $(top_srcdir)/../build-aux/mdate-sh $$dir/gettext.texi`; \
        echo "@set UPDATED $$1 $$2 $$3"; \
        echo "@set UPDATED-MONTH $$2 $$3"; \
        echo "@set EDITION $(VERSION)"; \

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index c196a2f0b70682f3cc26d038e5a936229580bd0d..d47c623b6c926fe77fb6a4a36f76912205d8539f 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-22  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (examplesbuildauxdir): Renamed from examplesconfigdir.
+       (examplesbuildaux_DATA): Renamed from examplesconfig_DATA.
+
 2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.

diff --git a/gettext-tools/lib/Makefile.am b/gettext-tools/lib/Makefile.am
index 0aaa0101a0ab7d0d69d8ff3ef693ae131cbc0137..02166172df7e422fd82742cdad644e328a54223b 100644 (file)
--- a/gettext-tools/lib/Makefile.am
+++ b/gettext-tools/lib/Makefile.am
@@ -139,8 +139,8 @@ gettextsrc_DATA = gettext.h
 # Files installed for the examples.
 
 docdir = @docdir@
-examplesconfigdir = $(docdir)/examples/config
-examplesconfig_DATA = \
+examplesbuildauxdir = $(docdir)/examples/build-aux
+examplesbuildaux_DATA = \
   javacomp.sh.in javaexec.sh.in \
   csharpcomp.sh.in csharpexec.sh.in
 

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 24d3fa38a0357add1856a55ceaf7dca506fe45cd..ddfb7742a658472154021c9d415c41b1746d86a1 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-22  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (examplesbuildauxdir): Renamed from examplesconfigdir.
+       (examplesbuildaux_DATA): Renamed from examplesconfig_DATA.
+
 2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.

diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index 7e24768e06f36b72922cfd3f3144a718d95c7dbb..9a7fd9837202695ecbbc0b3ec74f8066f44674a3 100644 (file)
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -37,8 +37,8 @@ aclocal_DATA = \
 # Files installed for the examples.
 
 docdir = @docdir@
-examplesconfigdir = $(docdir)/examples/config
-examplesconfig_DATA = \
+examplesbuildauxdir = $(docdir)/examples/build-aux
+examplesbuildaux_DATA = \
   gcj.m4 javacomp.m4 javaexec.m4 \
   csharpcomp.m4 csharpexec.m4