Author: dato-guest
Date: 2004-10-30 18:05:43 -0600 (Sat, 30 Oct 2004)
New Revision: 168

Modified:
   people/dato/kde-common/rules.mk
Log:
Install files with make just once (use install-stamp). Untested, I'll
see if it works. If somebody spots problems by reading the diff, please
tell.


Modified: people/dato/kde-common/rules.mk
===================================================================
--- people/dato/kde-common/rules.mk     2004-10-30 23:17:49 UTC (rev 167)
+++ people/dato/kde-common/rules.mk     2004-10-31 00:05:43 UTC (rev 168)
@@ -65,7 +65,7 @@
 clean::
        dh_testdir
        dh_testroot
-       rm -f build-arch-stamp build-indep-stamp configure-stamp \
+       rm -f build-arch-stamp build-indep-stamp configure-stamp install-stamp \
                debian/debiandirs debian/substvars
 
        # Remove manpages *iff* they were generated from sgml
@@ -91,30 +91,26 @@
        dh_clean
 
 # Install targets
-install: install-arch install-indep
-
-install-arch::
+install:: install-stamp
+install-stamp:
        dh_testdir
        dh_testroot
-       dh_clean -k -s
-       dh_installdirs -s
-
+       dh_clean -k
+       dh_installdirs
+       
        cd $(objdir) && \
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+       
+       touch install-stamp
 
+install-arch: install
        dh_install -s
 
-install-indep::
-       dh_testdir
-       dh_testroot
-       dh_clean -k -i
-       dh_installdirs -i
+install-indep: install
+       if grep -qE '^Architecture: +all *$$' debian/control; then \
+           dh_install -i; \
+       fi
 
-       cd $(objdir) && \
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-       dh_install -i
-
 # Binary targets
 
 # Must not depend on anything. This is to be called by

Reply via email to