[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-volatile, updated. debian/0.95+dfsg-1-241-ga79cb1d

[Stephen Gran]

The following commit has been merged in the debian/etch-volatile branch:
commit a79cb1dbbbd0612daaf59d666c02800e923272ee
Author: Stephen Gran <steve at lobefin.net>
Date:   Sun Jun 14 11:18:12 2009 +0100

    Move make check into build target so it is not run under fakeroot, and
    reenable make check
    Signed-off-by: Stephen Gran <steve at lobefin.net>
    
    Conflicts:
    
    	debian/rules
    
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/rules b/debian/rules
index dbcb1f9..6d7ea97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,15 @@ else
 	DEBUG_OPTS += --enable-debug
 endif
 with_check = disabled by DEB_BUILD_OPTIONS.
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+  with_check := disabled by DEB_BUILD_OPTIONS.
+else
+  ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+    with_check := disabled because cross-compiling.
+  else
+    with_check := yes
+  endif
+endif
 
 config.status: configure
 	dh_testdir
@@ -80,6 +89,20 @@ endif
 	perl -pe 's~#COMMON-FUNCTIONS#~qx{cat debian/common_functions}~eg' < debian/clamav-freshclam.config.in > debian/clamav-freshclam.config
 	perl -pe 's~#COMMON-FUNCTIONS#~qx{cat debian/common_functions}~eg' < debian/clamav-freshclam.postinst.in > debian/clamav-freshclam.postinst
 	touch build-arch-stamp
+ifeq ($(with_check),yes)
+ifneq (,$(filter alpha, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
+	@echo "Ignoring errors because of #521737"
+	-$(MAKE) check
+else
+ifneq (,$(filter ia64 sparc, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
+	$(MAKE) check EF_ALIGNMENT=8
+else
+	$(MAKE) check
+endif
+endif
+else
+	@echo "Testsuite not run: $(with_check)."
+endif
 
 clean:
 	debconf-updatepo
@@ -103,23 +126,6 @@ endif
 	rm -f debian/clamav-freshclam.postinst
 	dh_clean
 
-check:
-	dh_testdir
-ifeq ($(with_check),yes)
-ifneq (,$(filter alpha, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
-	@echo "Ignoring errors because of #521737"
-	-$(MAKE) check
-else
-ifneq (,$(filter ia64 sparc, $(shell dpkg-architecture -qDEB_BUILD_ARCH)))
-	$(MAKE) check EF_ALIGNMENT=8
-else
-	$(MAKE) check
-endif
-endif
-else
-	@echo "Testsuite not run: $(with_check)."
-endif
-
 install: install-indep install-arch
 install-indep: install-indep-stamp
 install-indep-stamp: build-indep-stamp
@@ -176,7 +182,7 @@ clamav-testfiles: install-indep
 	dh_fixperms -p$@
 	dh_builddeb -p$@
 
-install-arch: install-arch-stamp check
+install-arch: install-arch-stamp
 install-arch-stamp: build-stamp
 	dh_testdir
 	dh_testroot
@@ -337,4 +343,4 @@ binary-indep: build install clamav-base clamav-testfiles clamav-docs
 binary-arch: build install libclamav6 clamav clamav-daemon clamav-freshclam clamav-milter libclamav-dev clamav-dbg
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install check
+.PHONY: build clean binary-indep binary-arch binary install

-- 
Debian repository for ClamAV