r287: * Fiddlesticks. The neat make trick I was using in rules.multi2 failed if

     you try to build binary-indep and binary-arch targets in the same make
     run. Make tries to be too smart. Modified the file so it will work,
     though it's now uglier. Closes: 46287
   * examples/*: It's important that one -not- use a install-stamp target.
     Install should run every time binary-* calls it. Otherwise if a binary-*
     target is called twice by hand, you get duplicate entries in the
     maintainer script fragment files. Closes: #46313

diff --git a/examples/rules b/examples/rules
index d2d9f5d0334dc608b615e6da08637a150ba6de60..6d4880ff9cd7a2e971e69989635c0a04af5cac29 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -28,7 +28,7 @@ clean:
 
        dh_clean
 
-install:
+install: build
        dh_testdir
        dh_testroot
        dh_clean -k

diff --git a/examples/rules.indep b/examples/rules.indep
index 7b474a10e121bf045447e9918598c9e8831074f8..e2b33b49322d305ad53a62b87ba95faad4bb89fe 100755 (executable)
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -30,7 +30,7 @@ clean:
 
        dh_clean
 
-install:
+install: build
        dh_testdir
        dh_testroot
        dh_clean -k

diff --git a/examples/rules.multi b/examples/rules.multi
index f16b3e642da61f6debdad4f2e6f6ca4a0547cae6..55260d7e15f6894bfb3327eb0a1dff0f5e56607b 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -36,7 +36,7 @@ clean:
        dh_clean
 
 install: DH_OPTIONS=
-install: build-stamp
+install: build
        dh_testdir
        dh_testroot
        dh_clean -k

diff --git a/examples/rules.multi2 b/examples/rules.multi2
index 1f7733110aad921b189eace61f4cbcfd9b8d2175..765aceb6ca2fa7f2182f783cc8c776ea2dc470f5 100755 (executable)
--- a/examples/rules.multi2
+++ b/examples/rules.multi2
@@ -35,7 +35,7 @@ clean:
        dh_clean
 
 install: DH_OPTIONS=
-install:
+install: build
        dh_testdir
        dh_testroot
        dh_clean -k