diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 24 |
2 files changed, 9 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index d46bb56..677d668 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ gnumach (2:1.3.99.dfsg.cvs20080708-1) UNRELEASED; urgency=low - debian/patches/14_alloc_params.patch: Likewise. * Use $(filter ...) instead of $(findstring ...) to extract space separated options from DEB_BUILD_OPTIONS in debian/rules. + * Merge check targets into build targets. -- Guillem Jover <guillem@debian.org> Thu, 09 Aug 2007 01:45:22 +0300 diff --git a/debian/rules b/debian/rules index 2639667..340e6e5 100755 --- a/debian/rules +++ b/debian/rules @@ -23,12 +23,6 @@ else CFLAGS += -O2 endif -ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - CHECKS := -else - CHECKS := check-gnumach check-gnumach-dbg -endif - drivers := \ --enable-sis900 @@ -70,22 +64,20 @@ build: build-gnumach: configure dh_testdir +ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) -C build +else + $(MAKE) -C build check +endif build-gnumach-dbg: configure-dbg dh_testdir +ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) $(MAKE) -C build-dbg - -check-gnumach: build-gnumach - dh_testdir - - $(MAKE) -C build check - -check-gnumach-dbg: build-gnumach-dbg - dh_testdir - +else $(MAKE) -C build-dbg check +endif clean: unpatch dh_testdir @@ -95,7 +87,7 @@ clean: unpatch dh_clean -install: build-gnumach build-gnumach-dbg $(CHECKS) +install: build-gnumach build-gnumach-dbg dh_testdir dh_testroot dh_clean -a -k |