summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Vahlman <kalle.vahlman@movial.com>2012-06-20 10:35:39 +0300
committerKalle Vahlman <kalle.vahlman@movial.com>2012-06-20 10:36:23 +0300
commit32ea7542918387bcf28fb8dec347ddb166951754 (patch)
tree401b04aecadc3a50246f52e778aa7cde824cd4d2
parentda3bb37225549d630df72b803c1d9dcbe260363f (diff)
Fix arch handling in packaging to be based on bits not arch names
-rwxr-xr-xdebian/rules8
1 files changed, 3 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules
index 39da96c..dfc22f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,11 +16,9 @@ override_dh_auto_configure:
make config XALAN=/usr/share/java/xalan2.jar LCD_INSTALLDIR='dist/'
override_dh_auto_build:
-ifeq ($(DEB_HOST_ARCH),i386)
- make LBITS=32
-endif
-ifeq ($(DEB_HOST_ARCH),amd64)
- make LBITS=64
+ make LBITS=$(DEB_HOST_ARCH_BITS)
+
+ifeq ($(DEB_HOST_ARCH_BITS),64)
cp out/out_linux/liblcdriver_x64.so out/out_linux/liblcdriver.so
cp lcmodule/out/out_linux/liblcm_x64.so.1 lcmodule/out/out_linux/liblcm.so.1
endif