From 238fa3bf099a0e82e6254996a96c62469ee08d71 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 1 Jul 2012 16:44:26 +0200
Subject: [PATCH] Move build infrastructure files to build-aux/.

---
 .gitignore           |  4 ----
 ChangeLog            | 12 ++++++++++++
 Makefile.in          |  4 +++-
 autogen.sh           |  8 ++++----
 build-aux/.gitignore |  4 ++++
 configure.ac         |  2 ++
 doc/Makefile.in      |  2 +-
 src/Makefile.in      |  2 +-
 8 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 build-aux/.gitignore

diff --git a/.gitignore b/.gitignore
index 8a8e529..49f4065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,6 @@
 .#*
 \#*#
 
-# Files brought in by gnulib-tool:
-install-sh
-mkinstalldirs
-
 # Files generated by the autotools:
 /configure
 
diff --git a/ChangeLog b/ChangeLog
index e5fa28f..a975318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-01  Bruno Haible  <bruno@clisp.org>
+
+	Move build infrastructure files to build-aux/.
+	* autogen.sh: Copy install-sh and mkinstalldirst into build-aux/.
+	* configure.ac: Invoke AC_CONFIG_AUX_DIR.
+	* Makefile.in (IMPORTED_FILES): Update.
+	(distdir): Create subdirectories as needed.
+	* doc/Makefile.in (MKINSTALLDIRS): Update.
+	* src/Makefile.in (MKINSTALLDIRS): Update.
+	* .gitgnore: Remove install-sh, mkinstalldirs.
+	* build-aux/.gitignore: New file.
+
 2012-07-01  Bruno Haible  <bruno@clisp.org>
 
 	Distribute install-sh.
diff --git a/Makefile.in b/Makefile.in
index b91c78d..6c79c40 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,7 +64,7 @@ SOURCE_FILES = \
   configure.ac aclocal.m4 Makefile.in Makefile.msvc Makefile.vms \
   Makefile.devel ChangeLog
 # List of distributed files imported from other packages.
-IMPORTED_FILES = COPYING INSTALL install-sh mkinstalldirs
+IMPORTED_FILES = COPYING INSTALL build-aux/install-sh build-aux/mkinstalldirs
 # List of distributed files generated by autotools or Makefile.devel.
 GENERATED_FILES = configure
 # List of distributed files generated by "make".
@@ -75,6 +75,8 @@ DISTFILES = $(SOURCE_FILES) $(IMPORTED_FILES) $(GENERATED_FILES) $(DISTRIBUTED_B
 distdir : $(DISTFILES)
 	for file in $(DISTFILES); do \
 	  if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \
+	  destdir=`echo '$(distdir)'/$$file | sed -e 's|//*[^/]*$$||'`; \
+	  test -d "$$destdir" || mkdir "$$destdir"; \
 	  cp -p $$dir/$$file '$(distdir)'/$$file || exit 1; \
 	done
 	subdir=@subdir@; test -d '$(distdir)'/$$subdir || mkdir '$(distdir)'/$$subdir; cd $$subdir; $(MAKE) distdir distdir='$(distdir)'/$$subdir
diff --git a/autogen.sh b/autogen.sh
index bb68456..4bce7f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,15 +29,15 @@
 
 GNULIB_REPO_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f="
 
-for file in install-sh mkinstalldirs; do
+for file in build-aux/install-sh build-aux/mkinstalldirs; do
   if test -n "$GNULIB_TOOL"; then
-    $GNULIB_TOOL--copy-file build-aux/$file $file
+    $GNULIB_TOOL--copy-file $file $file
   else
-    wget -q --timeout=5 -O $file.tmp "${GNULIB_REPO_URL}build-aux/$file" \
+    wget -q --timeout=5 -O $file.tmp "${GNULIB_REPO_URL}$file" \
       && mv $file.tmp $file
   fi
 done
-chmod a+x install-sh mkinstalldirs
+chmod a+x build-aux/install-sh build-aux/mkinstalldirs
 
 rm -f configure lib/configure src/configure tests/configure doc/configure
 rm -f src/config.h.in src/config.h.msvc src/config.h_vms
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
new file mode 100644
index 0000000..b84cd9b
--- /dev/null
+++ b/build-aux/.gitignore
@@ -0,0 +1,4 @@
+# Files brought in by gnulib-tool:
+install-sh
+mkinstalldirs
+
diff --git a/configure.ac b/configure.ac
index c60db0a..5fb4099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,8 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.60])
 AC_INIT([doc/gperf.texi])
+AC_CONFIG_AUX_DIR([build-aux])
+
 AC_PROG_MAKE_SET
 AC_OBJEXT
 AC_EXEEXT
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e4e1d3e..bca44f5 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -55,7 +55,7 @@ TEXI2HTML = perl $(srcdir)/texi2html
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(SHELL) $(srcdir)/../mkinstalldirs
+MKINSTALLDIRS = $(SHELL) $(srcdir)/../build-aux/mkinstalldirs
 
 #### End of system configuration section. ####
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 1fecb3d..92a537e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -53,7 +53,7 @@ RM = rm -f
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(SHELL) $(srcdir)/../mkinstalldirs
+MKINSTALLDIRS = $(SHELL) $(srcdir)/../build-aux/mkinstalldirs
 
 #### End of system configuration section. ####