X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=debian%2Frules;h=4a2834e42253896ebed4e60c60b65d492d3b1ba4;hp=784d4cb19befd058d0363a9095b39e37e3f1960b;hb=10e5cb98e6bd83f82b1b5ff4ff18c515e152cd26;hpb=ed1e84f57021a76763bf8c71b4d1abdf2c25dac4

diff --git a/debian/rules b/debian/rules
index 784d4cb..4a2834e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ ifeq "$(strip $(LAUNCHER))" "yes"
 	LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher"
 	LAUNCHER_CFLAGS = -shared
 	LAUNCHER_LDFLAGS = -pie -shared -export-dynamic
+	CFLAGS += -fPIC
 endif
 
 
@@ -60,6 +61,7 @@ build-stamp:  config.status
          MAEMO_LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
 	touch build-stamp
 
+
 clean:
 	dh_testdir
 	dh_testroot
@@ -91,6 +93,13 @@ ifeq "$(strip $(LAUNCHER))" "yes"
 	$(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)/debian/control && rm $(CURDIR)/debian/tmp/usr/share/locale/en_GB/LC_MESSAGES/modest.mo	
+
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.