From 71a49fea1676398fcfd869aeafc8a673d72b00ab Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Sat, 21 Jun 2008 16:41:21 +0200
Subject: Trying to make autotest use the proper version

---
 test/Makefile.am | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 9a39981..49f66d8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,19 +25,24 @@ DISTCLEANFILES += \
 	testsuite.dir/at-check-line \
 	testsuite.dir/at-status
 
-check-local: atconfig atlocal $(TESTSUITE)
-	if test -f "$(srcdir)/$(TESTSUITE)"; then dir="$(srcdir)"; else dir="."; fi; \
-	$(SHELL) "$${dir}/$(TESTSUITE)" AUTOTEST_PATH=`cd $(top_builddir) > /dev/null && pwd`:`cd $(top_builddir)/nbb > /dev/null && pwd` \
+#all-local:
+#	git_ver=`$(top_srcdir)/build-helpers/package-version $(top_srcdir) version-stamp`; \
+#	if test "x$${git_ver}" = "x$(PACKAGE_VERSION)"; then :; else \
+#		rm -f $(srcdir)/$(TESTSUITE); \
+#		rm -f $(srcdir)/package.m4; \
+#	fi
+
+check-local: atconfig atlocal $(srcdir)/$(TESTSUITE)
+	$(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH=`cd $(top_builddir) > /dev/null && pwd`:`cd $(top_builddir)/nbb > /dev/null && pwd` \
 		$(TESTSUITEFLAGS)
 
-installcheck-local: atconfig atlocal $(TESTSUITE)
-	if test -f "$(srcdir)/$(TESTSUITE)"; then dir="$(srcdir)"; else dir="."; fi; \
-	$(SHELL) "$${dir}/$(TESTSUITE)" AUTOTEST_PATH='$(bindir)' \
+installcheck-local: atconfig atlocal $(srcdir)/$(TESTSUITE)
+	$(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH='$(bindir)' \
 		$(TESTSUITEFLAGS)
 
 clean-local:
-	test ! -f '$(TESTSUITE)' || \
-		$(SHELL) '$(TESTSUITE)' --clean
+	test ! -f '$(srcdir)/$(TESTSUITE)' || \
+		$(SHELL) '$(srcdir)/$(TESTSUITE)' --clean
 
 # Note about the location of testsuite.at, $(TESTSUITE), and package.m4:
 # We locate these files in the $(srcdir), because
@@ -80,7 +85,7 @@ $(srcdir)/$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/local.at $(srcdir)/pack
 	else mv -f $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE); fi
 
 EXTRA_DIST += $(srcdir)/package.m4
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_srcdir)/Makefile.in $(srcdir)/Makefile.in
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_builddir)/config.status Makefile.in
 	:; { \
 		echo '# Signature of the current package (generated by tests/Makefile.am).'; \
 		echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
@@ -93,5 +98,8 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_srcdir)/Makefile.in $(src
 	then rm -f package.m4.tmp; \
 	else mv -f package.m4.tmp $(srcdir)/package.m4; fi
 
+dist-hook:
+	$(MAKE) $(srcdir)/package.m4 $(srcdir)/$(TESTSUITE)
+
 # End of tests/Makefile.am.
 
-- 
cgit