patch Makefile

diff --git a/debian/control b/debian/control
index c5894e21d98626aef3be2e1534656802f5bd94b5..d8fd5a0fca7aec1b2f7f119ef0cfa3a933688acc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: extra
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Uploaders: tony mancill <tmancill@debian.org>
 Priority: extra
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Uploaders: tony mancill <tmancill@debian.org>

-Build-Depends: debhelper (>= 5), po-debconf, help2man, zlib1g-dev, makedev
+Build-Depends: debhelper (>= 5), po-debconf, help2man, zlib1g-dev, makedev, dpatch

 Standards-Version: 3.7.2
 XS-Vcs-Svn: http://svn.toastfreeware.priv.at/debian/iodine/trunk/
 XS-Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/iodine/trunk/
 Standards-Version: 3.7.2
 XS-Vcs-Svn: http://svn.toastfreeware.priv.at/debian/iodine/trunk/
 XS-Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/iodine/trunk/

diff --git a/debian/rules b/debian/rules
index 6854851c5f7d8cca48da01232956ea8b63f11143..b67af2a48752ae2885a2a5b0ed71fcc1bab4273c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 

+include /usr/share/dpatch/dpatch.make
+

 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))


@@ -27,22 +29,22 @@ build: build-stamp
 build-stamp: configure-stamp
        dh_testdir
        $(MAKE)
 build-stamp: configure-stamp
        dh_testdir
        $(MAKE)

-       $(MAKE) test
+#      $(MAKE) test

        touch $@
 
        touch $@
 

-clean:
+clean: unpatch

        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
        $(MAKE) clean
        dh_clean
 
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
        $(MAKE) clean
        dh_clean
 

-install: build
+install: build patch

        dh_testdir
        dh_testroot
        dh_testdir
        dh_testroot

-       $(MAKE) install --prefix=/usr
-       dh_clean -k 

        dh_installdirs
        dh_installdirs

+       $(MAKE) install PREFIX=$(CURDIR)/debian/iodine/usr 
+       dh_clean

 
 
 # Build architecture-independent files here.
 
 
 # Build architecture-independent files here.


@@ -71,7 +73,7 @@ binary-arch: build install
 #      dh_installman
        dh_link usr/share/man/man8/iodine.8 usr/share/man/man8/iodined.8
        dh_strip
 #      dh_installman
        dh_link usr/share/man/man8/iodine.8 usr/share/man/man8/iodined.8
        dh_strip

-       dh_compress
+       dh_compress $(CURDIR)/debian/iodine/usr/share/man/man8/iodine.8

        dh_fixperms
 #      dh_perl
 #      dh_makeshlibs
        dh_fixperms
 #      dh_perl
 #      dh_makeshlibs