X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=debian%2Frules;h=742754da0334ac700ab6b634adde79f063929514;hp=f6da55353c8a648b5011b080d4bfc0fdf111db3f;hb=50febec782f963624b1ddca59fb3b1c3d7713151;hpb=9b63b7e008e34d0a44e72e51047b3c5ccf921da6

diff --git a/debian/rules b/debian/rules
index f6da553..742754d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,24 +25,19 @@ ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -mthumb
 endif
 
-LAUNCHER = no
-#ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
-#	LAUNCHER = yes
-#endif
-
-ifeq "$(strip $(LAUNCHER))" "yes"
-	LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
-	LAUNCHER_CFLAGS = -shared
-	LAUNCHER_LDFLAGS = -pie -shared -export-dynamic
-	CFLAGS += -fPIC
+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) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	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:
@@ -56,9 +51,7 @@ build-stamp:  config.status
 	dh_testdir
 
         # commands to compile the package.
-	$(MAKE) \
-         MAEMO_LAUNCHER_CFLAGS="$(LAUNCHER_CFLAGS)" \
-         MAEMO_LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
+	$(MAKE)
 	touch build-stamp
 
 
@@ -68,7 +61,9 @@ clean:
 	rm -f build-stamp 
 
 # commands to clean up after the build process.
-	-$(MAKE) distclean
+#	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
+
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -86,18 +81,11 @@ install: build
 # install the package into debian/tmp/
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-ifeq "$(strip $(LAUNCHER))" "yes"
-	mv $(CURDIR)/debian/tmp/usr/bin/modest \
-	$(CURDIR)/debian/modest/usr/bin/modest.launch
-	ln -s /usr/bin/maemo-invoker \
-	$(CURDIR)/debian/modest/usr/bin/modest
-endif
-
 # ACHTUNG: hack
 # we remove the modest.mo english localization, if the current control file contains a reference
 # to modest-l10n-mr0; thus, the modest package will not conflict with that one.
 # if modest-l10n-mr0 is not there, we'll install our own (en_GB) .mo file.
-	grep modest-l10n-mr0 $(CURDIR)/control && rm $(CURDIR)/tmp/usr/share/locale/en_GB/LC_MESSAGES/modest.mo	
+	if grep -q modest-l10n-mr0 $(CURDIR)/debian/control ; then rm $(CURDIR)/debian/tmp/usr/share/locale/en_GB/LC_MESSAGES/modest.mo ; else echo "modest.mo not removed."; fi
 
 
 # Build architecture-independent files here.
@@ -123,7 +111,7 @@ binary-arch: build install
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip --keep-debug --dbg-package=modest --dbg-package=libmodest-dbus-client
+	dh_strip --keep-debug --dbg-package=modest
 	dh_compress
 	dh_fixperms
 #	dh_perl
@@ -131,7 +119,10 @@ binary-arch: build install
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- $(LAUNCHER_DEPENDS)
+	# Not a requirement by now, so don't fail if it's not installed
+	which dh_maemolauncher && dh_maemolauncher usr/bin/modest || true
+	dh_gencontrol
+#	sh debian/scripts/renew_control_file.sh
 	dh_md5sums
 	dh_builddeb