From 8bfc314904bffcb3d4dc0f2e21fa0fb8dd0bde60 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Mon, 7 Apr 2014 19:51:40 +0200
Subject: move native build install location and dependencies

---
 flow-native/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'flow-native/Makefile')

diff --git a/flow-native/Makefile b/flow-native/Makefile
index 29080a3..a768bd3 100644
--- a/flow-native/Makefile
+++ b/flow-native/Makefile
@@ -16,7 +16,7 @@ TARGET=$(SONAME).$(MINOR).$(MICRO)
 
 # Linux-specific flags
 LDFLAGS+=-shared -Wl,-soname,$(SONAME)
-INCLUDES+=$(JAVA_HOME)/include/ $(JAVA_HOME)/include/linux/
+INCLUDES+=$(JNI_INCLUDE)
 
 # All final products that should be installed
 PRODUCTS=$(TARGET) $(SONAME) $(LIB)
@@ -43,11 +43,11 @@ $(LIB): $(SONAME)
 
 # Install resulting artifacts
 install: all
-	@for product in $(PRODUCTS); do cp -P -t $(DESTDIR)/$(PREFIX)/lib $${product}; done
+	@for product in $(PRODUCTS); do cp -P -t $(DESTDIR)/$(PREFIX) $${product}; done
 
 # Uninstall resulting artifacts
 uninstall:
-	@for product in $(PRODUCTS); do rm $(DESTDIR)/$(PREFIX)/lib/$${product}; done
+	@for product in $(PRODUCTS); do rm $(DESTDIR)/$(PREFIX)/$${product}; done
 
 # Clean build
 clean:
-- 
cgit v1.2.3