X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jni.mk;h=1892613b12fcc9a9163b4f547f989c43a203e5cf;hb=HEAD;hp=5e863d5e4a56a477cbd936646fb5f211f1edd720;hpb=a0fb115898aff321ee979e412049bd9f6da2b462;p=cc0%2Fargeo-build.git

diff --git a/jni.mk b/jni.mk
index 5e863d5..1892613 100644
--- a/jni.mk
+++ b/jni.mk
@@ -14,9 +14,9 @@ DEP_INCLUDES ?= $(foreach dep, $(DEP_NATIVE), /usr/include/$(dep))
 DEP_LIBS ?= $(foreach dep, $(DEP_NATIVE), -l$(dep))
 
 A2_NATIVE_CATEGORY=$(A2_OUTPUT)/lib/linux/$(shell uname -m)/$(A2_CATEGORY)
-TARGET_EXEC := libJava_$(NATIVE_PACKAGE).so
+TARGET_EXEC := libJava_$(NATIVE_PACKAGE).$(major).$(minor).so
 
-LDFLAGS ?= -shared -fPIC -Wl,-soname,$(TARGET_EXEC).$(MAJOR).$(MINOR) $(DEP_LIBS)
+LDFLAGS ?= -shared -fPIC -Wl,-soname,$(TARGET_EXEC).$(major).$(minor).$(micro) $(DEP_LIBS)
 CFLAGS ?= -O3 -fPIC
 
 SRC_DIRS := . 
@@ -36,10 +36,11 @@ clean:
 	$(RM) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC)
 
 install:
-	install -D -m644 $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC) $(A2_NATIVE_INSTALL_TARGET)
+	$(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(A2_NATIVE_CATEGORY)/$(TARGET_EXEC)
 
 uninstall:
-	$(RM) $(A2_NATIVE_INSTALL_TARGET)/$(TARGET_EXEC)
+	$(RM) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)/$(TARGET_EXEC)
+	@if [ -d $(A2_NATIVE_INSTALL_TARGET) ]; then find $(A2_NATIVE_INSTALL_TARGET) -empty -type d -delete; fi
 
 # Sources
 SRCS := $(shell find $(SRC_DIRS) -name '*.cpp' -or -name '*.c' -or -name '*.s')