X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=debian%2Frules;h=2daa7f73caa408355335bc3002c2d04a9844805f;hp=2a0afbd2480d44af9e6ce482546e45e4ff51a3c5;hb=472d6c0023896bb420fa89faab27e421aae0aaaa;hpb=bff60a9de4172e899067fa539c01dd0f028071a4

diff --git a/debian/rules b/debian/rules
index 2a0afbd..2daa7f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,17 +25,19 @@ ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -mthumb
 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,8 +118,9 @@ 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
 	dh_builddeb