From: Jose Dapena Paz <jdapena@igalia.com>
Date: Tue, 5 Feb 2008 12:58:48 +0000 (+0000)
Subject: * debian/rules:
X-Git-Tag: git_migration_finished~1714
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=66fb7e72888e943e1666550dfdfe24503154e1f8

* debian/rules:
	* Reenable maemo launcher (fixes NB#79471).
	* Also respect debug DEB_BUILD_OPTIONS parameter.

pmo-trunk-r4138
---

diff --git a/debian/rules b/debian/rules
index 64e6c91..fd0a3ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,15 +27,19 @@ endif
 
 # maemo-launcher support is not working properly yet, so leave it disabled
 #DEB_BUILD_OPTIONS := $(DEB_BUILD_OPTIONS),nolauncher
-#ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
-#	conf_opt := --enable-maemo-launcher
-#endif
+ifeq (,$(findstring nolauncher,$(DEB_BUILD_OPTIONS)))
+	conf_opt = --enable-maemo-launcher
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	conf_opt += --enable-debug
+endif
 
 config.status: configure
 	dh_testdir
 	# commands to configure the package.
 	if [ ! -x configure ]; then ./autogen.sh; fi
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-maemo-launcher --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(conf_opt)
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(conf_opt)
 
 configure: configure-stamp
 configure-stamp:
@@ -116,7 +120,7 @@ binary-arch: build install
 	dh_installdeb
 	dh_shlibdeps
 	# Not a requirement by now, so don't fail if it's not installed
-#	which dh_maemolauncher && dh_maemolauncher usr/bin/modest || true
+	which dh_maemolauncher && dh_maemolauncher usr/bin/modest || true
 	dh_gencontrol
 	sh debian/scripts/renew_control_file.sh
 	dh_md5sums