[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. upstream/8.0.1-63-g5bd8ce8

[Jakub Adam]

The following commit has been merged in the master branch:
commit 5bd8ce857205328b9ff7710fd79f636465ce1e15
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Oct 21 23:02:58 2011 +0200

    Install jni libraries into multiarch aware location

diff --git a/debian/changelog b/debian/changelog
index 11abeed..ac54c41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse-cdt (8.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Install jni libraries into multiarch aware location
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 06 Oct 2011 21:15:04 +0200
 
diff --git a/debian/rules b/debian/rules
index 59e2444..ea43690 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,8 +43,9 @@ override_jh_compilefeatures:
 		make JAVA_HOME="$(JAVA_HOME)" ARCH=$(ECLIPSE_BUILD_ARCH) CC='gcc -D_GNU_SOURCE' CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="$(LDFLAGS) -fPIC"
 	jh_compilefeatures --build-opts="-DjavacTarget=1.5 -DjavacSource=1.5 -DbuildId=$(BUILD_ID) -DforceContextQualifier=$(BUILD_ID)";
 
+jnidir := /usr/lib/$(DEB_HOST_MULTIARCH)/jni
 override_dh_install:
-	dh_install -peclipse-cdt $(BUILD_DIR)/org.eclipse.cdt.core.linux.$(ECLIPSE_BUILD_ARCH)/os/linux/$(ECLIPSE_BUILD_ARCH)/*.so usr/lib/jni/
+	dh_install -peclipse-cdt $(BUILD_DIR)/org.eclipse.cdt.core.linux.$(ECLIPSE_BUILD_ARCH)/os/linux/$(ECLIPSE_BUILD_ARCH)/*.so $(jnidir)
 	dh_install --remaining-packages
 
 override_jh_installeclipse:

-- 
eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package.