summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2016-04-25 14:21:04 +0000
committerhallgren <hallgren@chalmers.se>2016-04-25 14:21:04 +0000
commit41171be5a6473eeb5de42e3f2c0e20c854d1481a (patch)
treecff48433a0be9e9ca3c8ae3f070c2cba880d0424 /debian
parent983da7adfc714f7e15fc14aeeb103f273fe0b57e (diff)
Fix a problem building the Java binding when creating binary packages
Pass -I and -L flags to gcc so that the C run-time system can be found. Also added a line in src/runtime/java/Makefile to install jpgf.jar.
Diffstat (limited to 'debian')
-rw-r--r--debian/rules3
1 files changed, 1 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules
index bf2d65372..366d923e5 100644
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_shlibdeps:
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 INSTALL_PATH=/usr/lib
+ cd src/runtime/java && make CFLAGS="-I$(CURDIR)/src/runtime/c -L$(CURDIR)/src/runtime/c/.libs" INSTALL_PATH=/usr/lib
echo LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal build
@@ -37,7 +37,6 @@ override_dh_auto_install:
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
- cp src/runtime/java/jpgf.jar $(CURDIR)/debian/gf/usr/lib
D="`find debian/gf -name site-packages`" && [ -n "$$D" ] && cd $$D && cd .. && mv site-packages dist-packages
override_dh_auto_test: