From fad8e7f7b938be4b711efebe33664afc1e5869df Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 6 May 2013 20:03:22 +0200
Subject: [PATCH] Move auxiliary build tools to build-aux/

---
 Make.mk                                | 3 ++-
 compile => build-aux/compile           | 0
 config.guess => build-aux/config.guess | 0
 config.sub => build-aux/config.sub     | 0
 depcomp => build-aux/depcomp           | 0
 install-sh => build-aux/install-sh     | 0
 configure.ac                           | 3 ++-
 7 files changed, 4 insertions(+), 2 deletions(-)
 rename compile => build-aux/compile (100%)
 rename config.guess => build-aux/config.guess (100%)
 rename config.sub => build-aux/config.sub (100%)
 rename depcomp => build-aux/depcomp (100%)
 rename install-sh => build-aux/install-sh (100%)

diff --git a/Make.mk b/Make.mk
index 4a1b2328d..05dda79bf 100644
--- a/Make.mk
+++ b/Make.mk
@@ -369,7 +369,8 @@ dist-client: $(cli_distgen)
 	-C $(srcdir)/src/lib/global version.c				\
 	-C $(srcdir)/src/lib $(addprefix w32/, $(client/w32))		\
 	-C $(srcdir)/man empire.6					\
-	-C $(srcdir) COPYING INSTALL install-sh
+	-C $(srcdir)/build-aux install-sh				\
+	-C $(srcdir) COPYING INSTALL
 
 .PHONY: dist-info
 dist-info: info html
diff --git a/compile b/build-aux/compile
similarity index 100%
rename from compile
rename to build-aux/compile
diff --git a/config.guess b/build-aux/config.guess
similarity index 100%
rename from config.guess
rename to build-aux/config.guess
diff --git a/config.sub b/build-aux/config.sub
similarity index 100%
rename from config.sub
rename to build-aux/config.sub
diff --git a/depcomp b/build-aux/depcomp
similarity index 100%
rename from depcomp
rename to build-aux/depcomp
diff --git a/install-sh b/build-aux/install-sh
similarity index 100%
rename from install-sh
rename to build-aux/install-sh
diff --git a/configure.ac b/configure.ac
index 0c439e40c..4c274be74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 #   configure.ac: Autoconf input file
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2010
+#      Markus Armbruster, 2005-2013
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -40,6 +40,7 @@ AC_PREREQ(2.64)
 AC_INIT([Wolfpack Empire], [4.3.31], [wolfpack@wolfpackempire.com], [empire],
 	[http://www.wolfpackempire.com/])
 AC_CONFIG_SRCDIR([include/combat.h])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
-- 
2.43.0