r2165@windlord: eagle | 2006-06-07 12:56:09 -0700

   * Use a better method of optionally running make distclean.
   * Add build-arch and build-indep targets, just in case.

diff --git a/debian/changelog b/debian/changelog
index b010b8f3f390dba503573df5bd951e87e1fad961..1fd9182541da6e094a3ba5ac8216c29c8a5f9fc1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ openafs (1.4.1-3) unstable; urgency=low
   * Regenerate the man pages on build since the pre-generated ones were
     done with a very old version of pod2man.
   * Update standards version to 3.7.2 (no changes required).
+  * Use a better method of optionally running make distclean.
+  * Add build-arch and build-indep targets, just in case.
 
- -- Russ Allbery <rra@debian.org>  Wed,  7 Jun 2006 12:52:06 -0700
+ -- Russ Allbery <rra@debian.org>  Wed,  7 Jun 2006 12:55:36 -0700
 
 openafs (1.4.1-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 0f6461d20ed1dd1f7521f7b84f9adba3fd4caa62..d8e2ffe45574449d8fd4386985eddf6572c2dd07 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -97,7 +97,9 @@ configure-stamp:
        chmod a+x src/libafs/make_kbuild_makefile.pl         
        touch configure-stamp
 
-build: configure-stamp build-stamp
+build: build-arch build-indep
+build-arch: configure-stamp build-stamp
+build-indep:
 build-stamp:
        dh_testdir
        mkdir -p $(CURDIR)/debian/tmp
@@ -111,9 +113,7 @@ clean:
        dh_testroot
        rm -f build-stamp configure-stamp
        rm -f build-modules-stamp configure-modules-stamp
-ifeq (Makefile,$(wildcard Makefile))
-       $(MAKE) distclean
-endif
+       [ ! -f Makefile ] || $(MAKE) distclean
        dh_clean
 
 install: DH_OPTIONS=
@@ -295,6 +295,6 @@ binary-modules: install-modules
        dh_md5sums
        dh_builddeb --destdir="$(KPKG_DEST_DIR)"
 
-.PHONY: build clean binary-indep binary-arch binary install configure
-.PHONY: kdist_configure kdist_image kdist kdist_clean binary-source
-.PHONY: configure-modules build-modules install-modules binary-modules
+.PHONY: binary binary-arch binary-indep binary-modules binary-source build
+.PHONY: build-arch build-indep build-modules clean configure configure-modules
+.PHONY: install install-modules kdist kdist_clean kdist_configure kdist_image