From 14e5528544462d9b3645da7a91120e418cc3a28b Mon Sep 17 00:00:00 2001
From: Thomas Hallgren <th-github@altocumulus.org>
Date: Mon, 18 Nov 2019 15:54:44 +0100
Subject: Fix build problems, bump versiom to gf-3.10.4-git debian/rules and
 bin/build-binary-dist.sh needed to be adepted to changes in how INSTALLPATH
 is used in src/runtime/java/Makefile.

---
 bin/build-binary-dist.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/build-binary-dist.sh b/bin/build-binary-dist.sh
index 7a0e684bb..4be61379a 100755
--- a/bin/build-binary-dist.sh
+++ b/bin/build-binary-dist.sh
@@ -53,9 +53,9 @@ fi
 if which >/dev/null javac && which >/dev/null jar ; then
     pushd src/runtime/java
     rm -f libjpgf.la # In case it contains the wrong INSTALL_PATH
-    if make CFLAGS="-I$extrainclude -L$extralib" INSTALL_PATH="$prefix/lib"
+    if make CFLAGS="-I$extrainclude -L$extralib" INSTALL_PATH="$prefix"
     then
-	make INSTALL_PATH="$destdir$prefix/lib" install
+	make INSTALL_PATH="$destdir$prefix" install
     else
 	echo "*** Skipping the Java binding because of errors"
     fi
-- 
cgit v1.2.3