From a3dbdbf5fafb47979f2489ff80aff74685f83386 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@gnu.org>
Date: Mon, 12 Oct 2009 22:10:55 -0700
Subject: [PATCH] Move auxiliary files used for build into "build-aux"
 directory.

This reduces clutter in the root directory of the PSPP distribution.  It
is common practice for GNU software these days.
---
 Makefile.am                          | 2 +-
 Smake                                | 3 ++-
 texinfo.tex => build-aux/texinfo.tex | 0
 configure.ac                         | 1 +
 tests/automake.mk                    | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename texinfo.tex => build-aux/texinfo.tex (100%)

diff --git a/Makefile.am b/Makefile.am
index 78790a43..6cffa402 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
+EXTRA_DIST = OChangeLog ONEWS pspp-mode.el
 
 CLEANFILES = 
 CLEAN_LOCAL =
diff --git a/Smake b/Smake
index 22c0f692..176715bf 100644
--- a/Smake
+++ b/Smake
@@ -102,7 +102,8 @@ all:
 	touch m4/Makefile.am
 	$(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
 		--source-base=gl --lib=libgl --tests-base=tests \
-		--doc-base=gl/doc --aux-dir=. --import $(GNULIB_MODULES)
+		--doc-base=gl/doc --aux-dir=build-aux --import \
+		$(GNULIB_MODULES)
 	echo '*' > gl/.cvsignore
 	echo '*' > gl/m4/.cvsignore
 	libtoolize --force --automake
diff --git a/texinfo.tex b/build-aux/texinfo.tex
similarity index 100%
rename from texinfo.tex
rename to build-aux/texinfo.tex
diff --git a/configure.ac b/configure.ac
index e44dcce9..d6415d0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Initialize.
 AC_PREREQ(2.63)
 AC_INIT([GNU PSPP], [0.7.5], [bug-gnu-pspp@gnu.org], [pspp])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])
 AM_INIT_AUTOMAKE
diff --git a/tests/automake.mk b/tests/automake.mk
index 9b09474c..78f213cd 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -439,7 +439,7 @@ CLEAN_LOCAL += tests_clean
 tests_clean:
 	test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
-AUTOM4TE = $(SHELL) $(srcdir)/missing --run autom4te
+AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(TESTSUITE_AT)
 	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
-- 
2.30.2