X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=debian%2Frules;h=580398e4247bf12e39bb15180018d1e532998c77;hp=e58f62635e53b70585ebc8c08b33c959661613f2;hb=82f5c8e9b32eb3ec1810c2c2812a9a7b52026981;hpb=1e3b1303d7f5740a01cc7386014c2984556124cb

diff --git a/debian/rules b/debian/rules
index e58f626..580398e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,16 +9,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ifeq ($(DEB_HOST_ARCH),armel)
+#ifeq ($(DEB_HOST_ARCH),armel)
 	#EXTRA_CFLAGS += -mcpu=arm1136jf-s
 	# Use Thumb for smaller binaries unless otherwise requested
-	ifeq (,$(filter nothumb,$(DEB_BUILD_OPTIONS)))
-		EXTRA_CFLAGS += -mthumb
-	endif
-endif
-
-EXTRA_CPPFLAGS = -DFREMANTLE `pkg-config --cflags dbus-1`
-EXTRA_LDFLAGS = `pkg-config --libs dbus-1`
+	#ifeq (,$(filter nothumb,$(DEB_BUILD_OPTIONS)))
+	#	EXTRA_CFLAGS += -mthumb
+	#endif
+#endif
 
 configure: configure-stamp
 configure-stamp:
@@ -30,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 fremantle-util
 
 	touch $@
 
@@ -53,9 +50,10 @@ install: build
 
 	# Add here commands to install the package into
 	# debian/browser-switchboard.
-	make DESTDIR=debian/browser-switchboard install
+	make DESTDIR=debian/browser-switchboard install install-xsession-script
 	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