X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=debian%2Frules;h=34a45e8a47dd3452942068f68ad390bbc61cfc0c;hp=3bd21d479f3193cc76712923b9c6fecc5b949b25;hb=92ca066bc599b7d9206629432f6ae8e499677d9f;hpb=038ca2921c3f22a637bf5288f5d11b8041e7c548 diff --git a/debian/rules b/debian/rules index 3bd21d4..34a45e8 100755 --- a/debian/rules +++ b/debian/rules @@ -21,23 +21,23 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -LAUNCHER = no -ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS))) - LAUNCHER = yes +ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS))) + CFLAGS += -mthumb endif -ifeq "$(strip $(LAUNCHER))" "yes" - LAUNCHER_DEPENDS = -Vlauncher:Depends="maemo-launcher" - LAUNCHER_CFLAGS = -shared - LAUNCHER_LDFLAGS = -pie -shared -export-dynamic +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: @@ -51,18 +51,19 @@ 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 + clean: dh_testdir dh_testroot rm -f build-stamp - # commands to clean up after the build process. - -$(MAKE) distclean +# commands to clean up after the build process. +# -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean + ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -77,15 +78,15 @@ install: build dh_clean -k dh_installdirs - # install the package into debian/tmp/ +# 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. + 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. binary-indep: build install @@ -118,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