summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Mayrhofer <rene@mayrhofer.eu.org>2009-04-09 13:50:59 +0000
committerRene Mayrhofer <rene@mayrhofer.eu.org>2009-04-09 13:50:59 +0000
commit533772e8e5bedbe9d4b289bda207ee44f7e1bcf0 (patch)
treea361eba051803705ffa9cae46986ad9781eb1497
parente2be74f2104f9057f90ee42587d16e0121886fce (diff)
downloadvyos-strongswan-533772e8e5bedbe9d4b289bda207ee44f7e1bcf0.tar.gz
vyos-strongswan-533772e8e5bedbe9d4b289bda207ee44f7e1bcf0.zip
Slightly clean up debian/rules. More importantly, call dh_install to
actually get binaries into packages.
-rwxr-xr-xdebian/rules13
1 files changed, 6 insertions, 7 deletions
diff --git a/debian/rules b/debian/rules
index fdc593810..287820d42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,7 @@ build-stamp: patch
dh_testdir
./configure $(CONFIGUREARGS)
$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
+ touch build-stamp
clean: unpatch
dh_testdir
@@ -79,10 +80,10 @@ clean: unpatch
dh_clean
-install-strongswan: DH_OPTIONS=-a
-install-strongswan: build-stamp
+install: build-stamp
dh_testdir
dh_testroot
+ dh_clean
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/strongswan
@@ -141,6 +142,7 @@ binary-common:
dh_installdebconf
dh_installchangelogs NEWS
dh_installdocs README
+ dh_install
dh_link
dh_strip
dh_compress
@@ -152,16 +154,13 @@ binary-common:
dh_md5sums
dh_builddeb
-# Build architecture-independent files here.
binary-indep:
$(MAKE) -f debian/rules binary-common DH_OPTIONS=-i
-# Build architecture-dependent files here.
-binary-arch: install-strongswan
+binary-arch: install
$(MAKE) -f debian/rules binary-common DH_OPTIONS=-a
-# Any other binary targets build just one binary package at a time.
-binary-%: build-stamp install-strongswan
+binary-%: build-stamp install
make -f debian/rules binary-common DH_OPTIONS=-p$*
binary: binary-indep binary-arch