[openjfx] 01/01: Fixed the installation path of the natives libraries

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit 052c49c841b6b7d70d1b70281b1bbb43da7ae9dc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 7 09:45:32 2015 +0200

    Fixed the installation path of the natives libraries
---
 debian/rules | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 428b833..b39e51d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,18 +12,12 @@ export JAVA_HOME    = /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
 export OPENJFX_HOME = /usr/share/java/openjfx
 export QT_SELECT    = qt5
 
-build_arch_map =
-	alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc \
-	i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el \
-	powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64 \
-	sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32
 jvm_arch_map = \
 	alpha=alpha arm=arm armel=arm armhf=arm arm64=aarch64 amd64=amd64 hppa=parisc \
 	i386=i386 m68k=m68k mips=mips mipsel=mipsel mips64=mips64 mips64el=mips64el \
 	powerpc=ppc powerpcspe=ppc ppc64=ppc64 ppc64el=ppc64le \
 	sparc=sparc sparc64=sparc64 sh4=sh s390x=s390x ia64=ia64 m68k=m68k x32=x32
 
-build_arch := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_ARCH_CPU)=%, $(build_arch_map))))
 jvm_arch   := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_ARCH_CPU)=%, $(jvm_arch_map))))
 
 %:
@@ -67,7 +61,7 @@ override_dh_install:
 	dh_link -popenjfx $(OPENJFX_HOME)/lib/javafx-mx.jar         $(JAVA_HOME)/lib/javafx-mx.jar
 
 	ls -l build/sdk/rt/lib
-	dh_install -plibopenjfx-jni build/sdk/rt/lib/$(build_arch) $(JAVA_HOME)/jre/lib/$(jvm_arch)
+	dh_install -plibopenjfx-jni build/sdk/rt/lib/*/*.so $(JAVA_HOME)/jre/lib/$(jvm_arch)
 
 	dh_install -popenjfx-source build/javafx-src.zip $(JAVA_HOME)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git