[openjfx] 05/07: debian/rules: Updated the path to the SDK generated during the build

[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 e030c45431e281a74e3acc078b90d2b6731d3a9d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 18 14:53:53 2014 +0200

    debian/rules: Updated the path to the SDK generated during the build
---
 debian/changelog |  1 +
 debian/rules     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ccc1db..85ee58d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openjfx (8u20-b26-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Disabled the Gradle version check to build with Gradle 1.5
+  * debian/rules: Updated the path to the SDK generated during the build
   * Standards-Version updated to 3.9.6 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 18 Sep 2014 14:22:30 +0200
diff --git a/debian/rules b/debian/rules
index 4aeaeb1..1b7aa51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,18 +15,18 @@ override_dh_auto_build:
 override_dh_install:
 	dh_install -i
 
-	gzip -r -v --best build/linux-sdk/man/
-	dh_install -popenjfx build/linux-sdk/bin/* $(JAVA_HOME)/bin
-	dh_install -popenjfx build/linux-sdk/man   $(JAVA_HOME)
+	gzip -r -v --best build/sdk/man/
+	dh_install -popenjfx build/sdk/bin/* $(JAVA_HOME)/bin
+	dh_install -popenjfx build/sdk/man   $(JAVA_HOME)
 	dh_link -popenjfx $(JAVA_HOME)/bin/javafxpackager           /usr/bin/javafxpackager
 	dh_link -popenjfx $(JAVA_HOME)/man/man1/javafxpackager.1.gz /usr/share/man/man1/javafxpackager.1.gz
 
-	dh_install -plibopenjfx-java build/linux-sdk/lib                 $(JAVA_HOME)
-	dh_install -plibopenjfx-java build/linux-sdk/rt/lib/*.jar        $(JAVA_HOME)/jre/lib
-	dh_install -plibopenjfx-java build/linux-sdk/rt/lib/*.properties $(JAVA_HOME)/jre/lib
-	dh_install -plibopenjfx-java build/linux-sdk/rt/lib/ext          $(JAVA_HOME)/jre/lib
+	dh_install -plibopenjfx-java build/sdk/lib                 $(JAVA_HOME)
+	dh_install -plibopenjfx-java build/sdk/rt/lib/*.jar        $(JAVA_HOME)/jre/lib
+	dh_install -plibopenjfx-java build/sdk/rt/lib/*.properties $(JAVA_HOME)/jre/lib
+	dh_install -plibopenjfx-java build/sdk/rt/lib/ext          $(JAVA_HOME)/jre/lib
 
-	dh_install -plibopenjfx-jni build/linux-sdk/rt/lib/$(DEB_HOST_ARCH) $(JAVA_HOME)/jre/lib
+	dh_install -plibopenjfx-jni build/sdk/rt/lib/$(DEB_HOST_ARCH) $(JAVA_HOME)/jre/lib
 
 	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