From: Christoph Berg <myon@debian.org>
Date: Sat, 19 Jul 2008 23:35:35 +0000 (+0200)
Subject: Add a switch in debian/rules to make building mutt-patched configurable.
X-Git-Tag: 1.5.18-4~3
X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/87af727692f85414f3718e255d43d5631fe08ade?ds=inline

Add a switch in debian/rules to make building mutt-patched configurable.
---

diff --git a/debian/changelog b/debian/changelog
index 40cd967..cf7a50c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ mutt (1.5.18-3) unstable; urgency=low
   * Pull patch from upstream to fix multipart decoding. (Closes: #489283)
   * Add example sidebar config, thanks Stefano Zacchiroli. (Closes: #460452)
   * (Finally) compile with native Kerberos GSSAPI support. (Closes: #469483)
+  * Add a switch in debian/rules to make building mutt-patched configurable.
 
- -- Christoph Berg <myon@debian.org>  Sun, 20 Jul 2008 01:06:46 +0200
+ -- Christoph Berg <myon@debian.org>  Sun, 20 Jul 2008 01:35:03 +0200
 
 mutt (1.5.18-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 11eefc2..87fb63c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 
 include /usr/share/quilt/quilt.make
 
+###################### user serviceable parts ######################
+
+###
+# build a separate mutt-patched package?
+BUILD_PATCHED := yes
 ###
 # header cache backend
 # HCACHE_DB := bdb
@@ -12,6 +17,12 @@ HCACHE_DB := gdbm
 # GPGME := --enable-gpgme
 ###
 
+###################### variables ######################
+
+ifneq ($(BUILD_PATCHED),yes)
+export DH_OPTIONS := -Nmutt-patched
+endif
+
 # Configure arguments
 
 ifeq ($(HCACHE_DB),bdb)
@@ -72,13 +83,16 @@ endif
 # Directory to make the build on
 objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 
+###################### main ######################
+
 $(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	dh_clean
+	-mkdir $(objdir)-patched
 	
+ifeq ($(BUILD_PATCHED),yes)
 	###################### building mutt-patched ######################
 	autoreconf --install --include=m4
-	-mkdir $(objdir)-patched
 	cd $(objdir)-patched && \
 	env CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
 	../configure $(confflags)
@@ -87,6 +101,7 @@ $(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
 	
 	# we should just "make mutt" here, but that doesn't work yet
 	cd $(objdir)-patched && $(MAKE) CFLAGS="$(CFLAGS)"
+endif
 	
 	touch $@
 
@@ -132,8 +147,10 @@ install: build
 	  grep '^set' contrib/gpg.rc; \
 	  echo ) > debian/tmp/gpg.rc
 	
+ifeq ($(BUILD_PATCHED),yes)
 	# temporarily call the binary mutt-patched so dh_strip gets the debug file name right
 	install -D $(objdir)-patched/mutt debian/mutt-patched/usr/bin/mutt-patched
+endif
 	
 	# reportbug driver
 	dh_installdirs
@@ -154,7 +171,9 @@ binary binary-arch: install
 	dh_strip --dbg-package=mutt-dbg
 	rm -rf $(CURDIR)/debian/mutt-dbg/usr/share/doc/mutt-dbg \
 		$(CURDIR)/debian/mutt-patched/usr/share/doc/mutt-patched
+ifeq ($(BUILD_PATCHED),yes)
 	mv debian/mutt-patched/usr/bin/mutt-patched debian/mutt-patched/usr/bin/mutt
+endif
 	
 	dh_link
 	dh_compress --exclude usr/share/doc/mutt/README.Patches