Merge commit 'diablo-package-3.2-1' into test-branch

[browser-switch] / debian / rules

diff --git a/debian/rules b/debian/rules
index e5c9873..e58f626 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,17 @@
 # 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
+       #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`
+
 configure: configure-stamp
 configure-stamp:
        touch configure-stamp
@@ -53,6 +55,7 @@ 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
 
 
 binary-indep: build install