[SCM] eclipse-cdt - Plug-in for eclipse to handle C/C++ - Debian package. branch, master, updated. upstream/8.0.0-60-g577385c

Jakub Adam jakub.adam at ktknet.cz
Fri Sep 30 17:48:10 UTC 2011


The following commit has been merged in the master branch:
commit 56f826c5f2b5897ad5a46d0ef2bdec6422af25e2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Sep 30 18:37:58 2011 +0200

    Update build paths for architecture dependent libraries

diff --git a/debian/rules b/debian/rules
index 44a7a35..bb09cf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,12 +39,12 @@ override_dh_auto_build:
 	# Do not use the auto-build with ant.
 
 override_jh_compilefeatures:
-	cd $(BUILD_DIR)/results/plugins/org.eclipse.cdt.core.linux/library && \
+	cd $(BUILD_DIR)/org.eclipse.cdt.core.linux/library && \
 		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)";
 
 override_dh_install:
-	dh_install -peclipse-cdt $(BUILD_DIR)/results/plugins/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 usr/lib/jni/
 	dh_install --remaining-packages
 
 override_jh_installeclipse:

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



More information about the pkg-java-commits mailing list