[SCM] postgis branch, master, updated. upstream/2.0.1-66-g76b86c1

[Markus Wanner]

The following commit has been merged in the master branch:
commit 76b86c1fdc8e411d63e6252e1f8d5c471600b022
Author: Markus Wanner <markus at bluegap.ch>
Date:   Mon Jul 29 20:58:29 2013 +0200

    Cleanup check target, reduce duplication.

diff --git a/debian/changelog b/debian/changelog
index b640c7e..928cd3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgis (2.0.3-6) UNRELEASED; urgency=low
+
+  * Cleanup check target, reduce duplication.
+
+ -- Markus Wanner <markus at bluegap.ch>  Mon, 29 Jul 2013 17:01:22 +0200
+
 postgis (2.0.3-5) unstable; urgency=low
 
   * Build-Deps: rather than default-jdk, depend on openjdk 6 or 7, as the
diff --git a/debian/rules b/debian/rules
index fbf6dfb..e9afdba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ COMMON_CONFIGURE_ARGS = --host=$(DEB_HOST_GNU_TYPE) \
 
 build: build-arch build-indep
 
-build-arch: build-arch-stamp
+build-arch: build-arch-stamp check
 build-arch-stamp: configuration-stamp
 #	Build against the newest Postgres version
 	$(MAKE)
@@ -92,23 +92,6 @@ build-arch-stamp: configuration-stamp
 		$(MAKE) -C $(CURDIR)/debian/build-$$PGVER; \
 	done)
 
-#   Run unit tests (against the newest Postgres version only, for
-#   now).
-	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-2.0.3.so'" \
-		> $(CURDIR)/postgis-check-env.tmp
-
-	(set -e; \
-		test -z '$(CHECK)' || \
-		pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
-			-c '--environment $(CURDIR)/postgis-check-env.tmp' make check || (\
-		for LOGFILE in /tmp/pgis_reg/test_*_diff; do \
-			echo " ### $LOGFILE ###"; \
-			cat $$LOGFILE; \
-		done; \
-		echo " ### end of log dumps ###"; \
-		exit 2) \
-	)
-
 	touch $@
 
 build-indep: build-indep-stamp
@@ -257,17 +240,18 @@ install-arch: build-arch
 
 	dh_install -s
 
-check: build-arch
+check: build-arch-stamp
 #   Run unit tests (against the newest Postgres version only, for
 #   now).
 	echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-2.0.3.so'" \
 		> $(CURDIR)/postgis-check-env.tmp
 	(set -e; \
+		test -z '$(CHECK)' || \
 		pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
 			-c '--environment $(CURDIR)/postgis-check-env.tmp' make check || (\
 		for LOGFILE in /tmp/pgis_reg/test_*_diff; do \
-			echo " ### $LOGFILE ###"; \
-			cat $LOGFILE; \
+			echo " ### $$LOGFILE ###"; \
+			cat $$LOGFILE; \
 		done; \
 		echo " ### end of log dumps ###"; \
 		exit 2) \

-- 
PostGIS for PostgreSQL