From 03ff1c847762174737eaa30e763d2d1eb51a4d2f Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 9 Jan 2012 21:49:47 +0100
Subject: [PATCH] Revert "tests: Make the test setup more abusive to fix the
 build"

This reverts commit 41b42c72294d181217bae59e37ddf50c490df17f.
---
 openbsc/tests/Makefile.am | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am
index 7dc64e411..73e8b89e6 100644
--- a/openbsc/tests/Makefile.am
+++ b/openbsc/tests/Makefile.am
@@ -9,7 +9,7 @@ endif
 
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
-$(builddir)/package.m4: $(top_srcdir)/configure.ac $(top_builddir)/config.log
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_builddir)/config.log
 	:;{ \
                echo '# Signature of the current package.' && \
                echo 'm4_define([AT_PACKAGE_NAME],' && \
@@ -25,10 +25,10 @@ $(builddir)/package.m4: $(top_srcdir)/configure.ac $(top_builddir)/config.log
                echo 'm4_define([AT_PACKAGE_URL],' && \
                echo '  [$(PACKAGE_URL)])'; \
                $(ENABLE_NAT_TEST) \
-             } >'$(builddir)/package.m4'
+             } >'$(srcdir)/package.m4'
 
-EXTRA_DIST = testsuite.at $(builddir)/package.m4 $(TESTSUITE)
-TESTSUITE = $(builddir)/testsuite
+EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE)
+TESTSUITE = $(srcdir)/testsuite
 
 check-local: atconfig $(TESTSUITE)
 	$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
@@ -41,11 +41,9 @@ clean-local:
 	test ! -f '$(TESTSUITE)' || \
 		$(SHELL) '$(TESTSUITE)' --clean
 	$(RM) -f atconfig
-	$(RM) $(TESTSUITE)
-	$(RM) $(builddir)/package.m4
 
 AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): $(srcdir)/testsuite.at $(builddir)/package.m4
+$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
 	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
 	mv $@.tmp $@