aboutsummaryrefslogtreecommitdiff
path: root/flow-native/Makefile
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2014-04-07 19:51:40 +0200
committerJakob Odersky <jodersky@gmail.com>2014-04-07 19:51:40 +0200
commit8bfc314904bffcb3d4dc0f2e21fa0fb8dd0bde60 (patch)
tree70d13c09d7a202800d7f35bd434cbaaa2cd69fb6 /flow-native/Makefile
parent1a8b1b4c01579d42dbfea21881d0083c00ba472c (diff)
downloadakka-serial-8bfc314904bffcb3d4dc0f2e21fa0fb8dd0bde60.tar.gz
akka-serial-8bfc314904bffcb3d4dc0f2e21fa0fb8dd0bde60.tar.bz2
akka-serial-8bfc314904bffcb3d4dc0f2e21fa0fb8dd0bde60.zip
move native build install location and dependencies
Diffstat (limited to 'flow-native/Makefile')
-rw-r--r--flow-native/Makefile6
1 files changed, 3 insertions, 3 deletions
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: