maemo: Don't overwrite location of libexec.

[strongswan.git] / packages / maemo-strongswan / debian / rules

diff --git a/packages/maemo-strongswan/debian/rules b/packages/maemo-strongswan/debian/rules
index c2fa9dc..3eb1409 100755 (executable)
--- a/packages/maemo-strongswan/debian/rules
+++ b/packages/maemo-strongswan/debian/rules
@@ -22,8 +22,10 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CONFIG_OPTIONS = \
-       --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+       --prefix=/usr --sysconfdir=/etc \
        --disable-tools --disable-scripts \
+       --disable-fips-prf --disable-pubkey --disable-attr \
+       --disable-constraints --disable-revocation \
        --disable-sha1 --disable-sha2 --disable-aes --disable-des \
        --disable-md5 --disable-gmp --disable-pgp --disable-dnskey \
        --enable-openssl --enable-monolithic --enable-eap-identity \
@@ -62,14 +64,11 @@ build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp:  config.status
-
-       # Add here commands to compile the arch part of the package.
-       #$(MAKE) 
+       $(MAKE)
        touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp:  config.status
-
        # Add here commands to compile the indep part of the package.
        #$(MAKE) doc
        touch $@
@@ -79,7 +78,6 @@ clean:
        dh_testroot
        rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
 
-       # Add here commands to clean up after the build process.
        -$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
@@ -88,33 +86,18 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
 
-
        dh_clean 
 
-install: install-indep install-arch
-install-indep:
+install: build
        dh_testdir
        dh_testroot
-       dh_clean -k -i 
-       dh_installdirs -i
-
-       # Add here commands to install the indep part of the package into
-       # debian/<package>-doc.
-       #INSTALLDOC#
+       dh_clean -k
+       dh_installdirs
 
-       dh_install -i
+       $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
-install-arch:
-       dh_testdir
-       dh_testroot
-       dh_clean -k -s 
-       dh_installdirs -s
+       dh_install --list-missing --sourcedir=debian/tmp
 
-       # Add here commands to install the arch part of the package into 
-       # debian/tmp.
-       $(MAKE) DESTDIR=$(CURDIR)/debian/strongswan install
-
-       dh_install -s
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
 # in another 'make' thread.
@@ -146,13 +129,14 @@ binary-common:
        dh_gencontrol
        dh_md5sums
        dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
+
+# Build architecture independent packages using the common target.
+binary-indep: build-indep install
        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
+# Build architecture dependent packages using the common target.
+binary-arch: build-arch install
        $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch 
+.PHONY: build clean binary-indep binary-arch binary install