diff options
| -rwxr-xr-x | bin/build-binary-dist.sh | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | gf.cabal | 2 |
4 files changed, 11 insertions, 5 deletions
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 diff --git a/debian/changelog b/debian/changelog index 3425e7dcb..d413530a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gf (3.10.4-1) xenial bionic cosmic; urgency=low + + * GF 3.10.4 + + -- Thomas Hallgren <hallgren@chalmers.se> Fri, 18 Nov 2019 15:00:00 +0100 + gf (3.10.3-1) xenial bionic cosmic; urgency=low * GF 3.10.3 diff --git a/debian/rules b/debian/rules index 36e6ce706..917801826 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ SET_LDL=LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs override_dh_auto_build: cd src/runtime/python && EXTRA_INCLUDE_DIRS=$(CURDIR)/src/runtime/c EXTRA_LIB_DIRS=$(CURDIR)/src/runtime/c/.libs python setup.py build - cd src/runtime/java && make CFLAGS="-I$(CURDIR)/src/runtime/c -L$(CURDIR)/src/runtime/c/.libs" INSTALL_PATH=/usr/lib + cd src/runtime/java && make CFLAGS="-I$(CURDIR)/src/runtime/c -L$(CURDIR)/src/runtime/c/.libs" INSTALL_PATH=/usr echo $(SET_LDL) -$(SET_LDL) cabal build # builds gf, fails to build example grammars export $(SET_LDL); PATH=$(CURDIR)/dist/build/gf:$$PATH && make -C ../gf-rgl build @@ -36,7 +36,7 @@ override_dh_auto_install: export GF_LIB_PATH="$$(dirname $$(find "$(CURDIR)/debian/gf" -name www))/lib" && echo "GF_LIB_PATH=$$GF_LIB_PATH" && mkdir -p "$$GF_LIB_PATH" && make -C ../gf-rgl copy cd src/runtime/c && bash setup.sh copy prefix=$(CURDIR)/debian/gf/usr cd src/runtime/python && python setup.py install --prefix=$(CURDIR)/debian/gf/usr - cd src/runtime/java && make INSTALL_PATH=$(CURDIR)/debian/gf/usr/lib install + cd src/runtime/java && make INSTALL_PATH=$(CURDIR)/debian/gf/usr install D="`find debian/gf -name site-packages`" && [ -n "$$D" ] && cd $$D && cd .. && mv site-packages dist-packages override_dh_auto_clean: @@ -1,5 +1,5 @@ name: gf -version: 3.10.3-git +version: 3.10.4-git cabal-version: >= 1.22 build-type: Custom |