From 1f4f072346e388d7b6b6cf79b111952069c4e95c Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@thewalter.net>
Date: Tue, 14 Jan 2014 10:00:36 +0100
Subject: [PATCH] Build in srcdir != builddir fashion by default

Naturally this doesn't apply to tarballs
---
 .gitignore                            | 7 +++++++
 Makefile.am                           | 4 ++--
 autogen.sh                            | 3 ++-
 automaint.sh                          | 6 +++---
 build/Makefile.am                     | 9 ---------
 build/certs/{Makefile.am => Makefile} | 2 +-
 configure.ac                          | 2 --
 doc/manual/Makefile.am                | 3 ++-
 8 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 build/Makefile.am
 rename build/certs/{Makefile.am => Makefile} (98%)

diff --git a/.gitignore b/.gitignore
index cd5978e82..5c18615b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ config.sub
 configure
 configure.tmp
 depcomp
+makefile
 install-sh
 INSTALL
 libtool
@@ -61,8 +62,14 @@ x86_64-w64-mingw32
 /x86_64_w64-mingw32/
 
 /build/m4/*.m4
+/build/common
 /build/coverage
 /build/coverage.info
+/build/doc/
+/build/p11-kit/
+/build/p11-kit-[0123456789]*/
+/build/po/
+/build/trust/
 /local
 
 /common/tests/hash-test
diff --git a/Makefile.am b/Makefile.am
index 03fc5dc78..7170058b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ TRUST_DIR =
 endif
 
 SUBDIRS = \
-	build \
 	common \
 	p11-kit \
 	$(TRUST_DIR) \
@@ -64,7 +63,8 @@ upload-release: $(DIST_ARCHIVES)
 	scp $(DIST_ARCHIVES) $(DIST_ARCHIVES).sig $(WEBHOST):$(WEBBASE)/releases/
 
 EXTRA_DIST = \
-	config.rpath \
+	build/Makefile.tests \
+	build/Makefile.decl \
 	HACKING
 
 transifex:
diff --git a/autogen.sh b/autogen.sh
index 696f490ac..96cb604fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,6 +27,7 @@ test -f configure.ac~ && mv configure.ac~ configure.ac
 
 autoreconf --force --install --verbose
 if test x"$NOCONFIGURE" = x; then
-  exec ./configure "$@"
+  cd build/
+  exec ../configure "$@"
 fi
 
diff --git a/automaint.sh b/automaint.sh
index 487bf5084..8859dccc3 100755
--- a/automaint.sh
+++ b/automaint.sh
@@ -23,7 +23,7 @@ configure()
 # Configure the local build. To control which arguments are used create a
 # CONFIG_SITE script as directed in the autoconf documentation:
 # http://www.gnu.org/software/autoconf/manual/autoconf.html#Site-Defaults
-configure ./local --prefix=/usr --enable-doc --enable-coverage $ARGS "$@"
+configure ./build --prefix=/usr --enable-doc --enable-coverage $ARGS "$@"
 
 # Configure the cross builds
 for cross in $CROSS; do
@@ -37,7 +37,7 @@ done
 
 	for target in all check clean distclean; do
 		echo "$target:"
-		echo '	$(MAKE) -C ./local' $target
+		echo '	$(MAKE) -C ./build' $target
 		echo '	@for dir in $(CROSS); do \'
 		echo '		$(MAKE) -C ./$$dir' $target '; \'
 		echo '	done'
@@ -46,7 +46,7 @@ done
 	for target in distcheck memcheck leakcheck hellcheck install upload-coverage \
 		coverage upload-doc upload-release transifex; do
 		echo "$target:"
-		echo '	$(MAKE) -C ./local' $target
+		echo '	$(MAKE) -C ./build' $target
 	done
 
 ) > ./makefile
diff --git a/build/Makefile.am b/build/Makefile.am
deleted file mode 100644
index 11337b19e..000000000
--- a/build/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SUBDIRS = certs
-
-EXTRA_DIST = \
-	Makefile.tests
-
-memcheck:
-
-leakcheck:
diff --git a/build/certs/Makefile.am b/build/certs/Makefile
similarity index 98%
rename from build/certs/Makefile.am
rename to build/certs/Makefile
index 031cba074..4e61b1480 100644
--- a/build/certs/Makefile.am
+++ b/build/certs/Makefile
@@ -3,7 +3,7 @@
 # We copy everything into its final location, and those test files are
 # distributed in the tarballs
 
-TRUST = $(top_srcdir)/trust/tests
+TRUST = ../../trust/tests
 
 prepare-certs:
 	cp -v cacert3.der $(TRUST)/input/anchors
diff --git a/configure.ac b/configure.ac
index b9b538aa0..453807906 100644
--- a/configure.ac
+++ b/configure.ac
@@ -500,8 +500,6 @@ privatedir='${libdir}/p11-kit'
 AC_SUBST(privatedir)
 
 AC_CONFIG_FILES([Makefile
-	build/Makefile
-	build/certs/Makefile
 	common/Makefile
 	common/tests/Makefile
 	doc/Makefile
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index ce32df364..c9ff26415 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -130,7 +130,8 @@ XSLTPROC_FLAGS = \
         --stringparam man.copyright.section.enabled 0
 
 XSLTPROC_MAN = \
-	$(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+	$(XSLTPROC) $(XSLTPROC_FLAGS) --path $(builddir) \
+	http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 
 trust.1: trust.xml $(generate_files)
 	$(AM_V_GEN) $(XSLTPROC_MAN) $<