X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=debian%2Frules;h=1ccb8ed53e4eb95665002f5f5290cbbe0ed78b60;hp=e467af021578e3d06678ddb201a295b3c9bde82b;hb=2b1d2d3fa94e05a043dbc0601db6d15a91ab08fd;hpb=2bce6757025f1af4da367396049e031c306c54cf

diff --git a/debian/rules b/debian/rules
index e467af0..1ccb8ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Optimize for N8x0 CPUs if building for armel
 ifeq ($(DEB_HOST_ARCH),armel)
-	EXTRA_CFLAGS += -mcpu=arm1136jf-s
-	# Use Thumb for smaller binaries if requested
-	ifneq (,$(filter thumb,$(DEB_BUILD_OPTIONS)))
+	#EXTRA_CFLAGS += -mcpu=arm1136jf-s
+	# Use Thumb for smaller binaries unless otherwise requested
+	ifeq (,$(filter nothumb,$(DEB_BUILD_OPTIONS)))
 		EXTRA_CFLAGS += -mthumb
 	endif
 endif
@@ -28,8 +27,8 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 
-	make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" diablo
-	make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" diablo-plugin
+	make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" fremantle
+	make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" fremantle-plugin
 
 	touch $@
 
@@ -53,6 +52,8 @@ install: build
 	# debian/browser-switchboard.
 	make DESTDIR=debian/browser-switchboard install
 	make -C config-ui DESTDIR=../debian/browser-switchboard install
+	install -c -m 0644 debian/browser-switchboard-cp.desktop debian/browser-switchboard/usr/share/applications/hildon-control-panel
+	install -c -m 0644 debian/microb.desktop debian/browser-switchboard/usr/share/applications/hildon
 
 
 binary-indep: build install