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

[browser-switch] / debian / rules

diff --git a/debian/rules b/debian/rules
index 33738dd..e58f626 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,8 @@
 
 ifeq ($(DEB_HOST_ARCH),armel)
        #EXTRA_CFLAGS += -mcpu=arm1136jf-s
-       # Use Thumb for smaller binaries if requested
-       ifneq (,$(filter thumb,$(DEB_BUILD_OPTIONS)))
+       # Use Thumb for smaller binaries unless otherwise requested
+       ifeq (,$(filter nothumb,$(DEB_BUILD_OPTIONS)))
                EXTRA_CFLAGS += -mthumb
        endif
 endif
@@ -30,8 +30,8 @@ build: build-stamp
 build-stamp: configure-stamp 
        dh_testdir
 
-       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)"
+       make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" diablo
+       make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" diablo-plugin
 
        touch $@