mutt (1.5.14+cvs20070301-1) experimental; urgency=low

[software/mutt-debian.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index e14021554f8f0f4947c6e6e91c126d3c865f2b39..b7c71cd729fe90bcc36edd73b31834a9d2b9a3a4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,9 @@ confflags  =  --prefix=/usr                   \
                --enable-debug                  \
                --enable-fcntl                  \
                --enable-hcache                 \
+               --enable-gpgme                  \
                --enable-imap                   \
+               --enable-smtp                   \
                --enable-inodesort              \
                --enable-pop                    \
                                                \
@@ -93,7 +95,7 @@ $(objdir)/configure-stamp:
        env LC_COLLATE=C sort PATCHES.unsorted >PATCHES
        
        # do not rebuild these files
-       touch configure.in aclocal.m4 Makefile.in configure stamp-h.in config.h.in
+       touch configure.in aclocal.m4 Makefile.in configure config.h.in
        
        -mkdir $(objdir)
        cd $(objdir) && \
@@ -109,7 +111,7 @@ $(objdir)/configure-stamp:
 build: $(objdir)/build-stamp
 $(objdir)/build-stamp: $(objdir)/configure-stamp
        cd $(objdir) && \
-       $(MAKE)
+       $(MAKE) CFLAGS="$(CFLAGS)"
        
        touch $@
 
@@ -125,6 +127,7 @@ clean:
        # quilt cruft
        rm -f   patches
        rm -rf .pc
+       touch PATCHES
        
        # please dpkg-source
        rm -f po/*.gmo
@@ -154,13 +157,11 @@ debian/tmp/install-stamp:
        chmod +x debian/header.awk
        debian/header.awk debian/patches/features/* >debian/tmp/README.Patches
        
-       cp $(objdir)/Muttrc.head debian/tmp/Muttrc
-       echo "# GnuPG configuration" >>debian/tmp/Muttrc
-       grep '^set' contrib/gpg.rc \
-               | sed -e 's#pgpewrap#/usr/lib/mutt/pgpewrap#' \
-               | sed -e 's#/usr/bin/gpg#gpg#' \
-               >> debian/tmp/Muttrc
-       cat debian/extra/rc/* >>debian/tmp/Muttrc
+       ( cat $(objdir)/Muttrc.head; \
+         echo "# GnuPG configuration"; \
+         grep '^set' contrib/gpg.rc; \
+         echo; \
+         cat debian/extra/rc/* ) > debian/tmp/Muttrc
        
        touch $@
 
@@ -172,9 +173,9 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        
+       dh_installdirs
        dh_install
        dh_installman
-       dh_installmime
        dh_installmenu
        dh_installdocs
        dh_installexamples