X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=debian%2Frules;h=784d4cb19befd058d0363a9095b39e37e3f1960b;hp=106423828bb54f57eb380d9a8ec92ef7a1f3a4e7;hb=ed214a86a5d7dce63a8e2eff4eb8c8d05bfcd9ed;hpb=6e69f191c0ef782f2d8950dddd7e558e6026428d

diff --git a/debian/rules b/debian/rules
index 1064238..784d4cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,35 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
 CFLAGS = -Wall -g
 PACKAGENAME = modest
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
-#	CFLAGS += -O2
 	CFLAGS += -O2
 endif
 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
 
+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
@@ -39,10 +37,10 @@ ifeq "$(strip $(LAUNCHER))" "yes"
 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
 
 configure: configure-stamp
@@ -56,10 +54,10 @@ build: build-stamp
 build-stamp:  config.status
 	dh_testdir
 
-	# commands to compile the package.
+        # commands to compile the package.
 	$(MAKE) \
-	 MAEMO_LAUNCHER_CFLAGS="$(LAUNCHER_CFLAGS)" \
-	 MAEMO_LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
+         MAEMO_LAUNCHER_CFLAGS="$(LAUNCHER_CFLAGS)" \
+         MAEMO_LAUNCHER_LDFLAGS="$(LAUNCHER_LDFLAGS)"
 	touch build-stamp
 
 clean:
@@ -67,7 +65,7 @@ clean:
 	dh_testroot
 	rm -f build-stamp 
 
-	# commands to clean up after the build process.
+# commands to clean up after the build process.
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -75,8 +73,6 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-
-
 	dh_clean 
 
 install: build
@@ -85,17 +81,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/modest/usr/bin/modest \
-	   $(CURDIR)/debian/modest/usr/bin/modest.launch
+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
-
+	$(CURDIR)/debian/modest/usr/bin/modest
+endif
 
 # Build architecture-independent files here.
 binary-indep: build install