X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=debian%2Frules;h=33738dd2439cb9c394ee32eb5852ab3eaf1ae5df;hp=c773a37d8ad8faa215e171d6a9e477936b9e4184;hb=ae25c6b332df1c92b1433474bbf4c8b8b857b7ff;hpb=245d4f8fa09e3ea603e892495c891e4b826c17dc

diff --git a/debian/rules b/debian/rules
index c773a37..33738dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+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 += -mthumb
+	endif
+endif
 
-
+EXTRA_CPPFLAGS = -DFREMANTLE `pkg-config --cflags dbus-1`
+EXTRA_LDFLAGS = `pkg-config --libs dbus-1`
 
 configure: configure-stamp
 configure-stamp:
@@ -22,8 +30,8 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 
-	make
-	make -C config-ui
+	make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CPPFLAGS="$(EXTRA_CPPFLAGS)" EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)"
+	make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CPPFLAGS="$(EXTRA_CPPFLAGS)"
 
 	touch $@
 
@@ -46,7 +54,8 @@ install: build
 	# Add here commands to install the package into
 	# debian/browser-switchboard.
 	make DESTDIR=debian/browser-switchboard install
-	make -C config-ui 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
 
 
 binary-indep: build install