From: Keith Packard <keithp@keithp.com>
Date: Sun, 6 Mar 2016 23:04:23 +0000 (-0800)
Subject: libaltos: jni_md.h moved to linux subdir in Java install
X-Git-Tag: 1.6.3~2^2~90
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=ad07578d04926cb4b96c40a446c47ad3f9bad7df;hp=7cb388a33104fd78c8cb1fa08a6f114e3e1e372d;p=fw%2Faltos

libaltos: jni_md.h moved to linux subdir in Java install

Add the linux subdir to CFLAGS to find it.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/libaltos/Makefile.am b/libaltos/Makefile.am
index 1db2d486..ae731633 100644
--- a/libaltos/Makefile.am
+++ b/libaltos/Makefile.am
@@ -1,5 +1,5 @@
 JAVAC=javac
-AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE)
+AM_CFLAGS=-DLINUX -DPOSIX_TTY -I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux
 AM_JAVACFLAGS=-target 1.6 -encoding UTF-8 -Xlint:deprecation -source 6
 
 altoslibdir=$(libdir)/altos
@@ -64,7 +64,7 @@ classlibaltos.stamp: $(SWIG_FILE)
 
 MINGCC32=i686-w64-mingw32-gcc
 MINGCC64=x86_64-w64-mingw32-gcc
-MINGFLAGS=-Wall -DWINDOWS -DBUILD_DLL -I$(JVM_INCLUDE)
+MINGFLAGS=-Wall -DWINDOWS -DBUILD_DLL -I$(JVM_INCLUDE) -I$(JVM_INCLUDE)/linux
 MINGLIBS=-lsetupapi
 
 fat: all altos.dll altos64.dll