Releasing

[cc0/argeo-build.git] / osgi.mk

diff --git a/osgi.mk b/osgi.mk
index 4af7fff925db3c6dc54edd2595dcf4d2e50698b3..334714bf6ad9f6d37ac2c39edfda1ede82e5389e 100644 (file)
--- a/osgi.mk
+++ b/osgi.mk
@@ -80,12 +80,14 @@ osgi-clean: jni-clean
 osgi-install: jni-install
        $(ARGEO_MAKE) \
         install --category $(A2_CATEGORY) --bundles $(BUNDLES) \
-        --target $(A2_INSTALL_TARGET)
+        --target $(A2_INSTALL_TARGET) \
+        --os $(TARGET_OS) --target-native $(A2_NATIVE_INSTALL_TARGET)
 
 osgi-uninstall: jni-uninstall
        $(ARGEO_MAKE) \
         uninstall --category $(A2_CATEGORY) --bundles $(BUNDLES) \
-        --target $(A2_INSTALL_TARGET)
+        --target $(A2_INSTALL_TARGET) \
+        --os $(TARGET_OS) --target-native $(A2_NATIVE_INSTALL_TARGET)
 
 jni-all: 
        $(foreach dir, $(JNIDIRS), $(MAKE) -C $(dir) all;)
@@ -103,10 +105,4 @@ jni-uninstall:
 javadoc: $(BUILD_BASE)/built
        $(JAVADOC) -noindex -quiet -Xmaxwarns 1 -d $(BUILD_BASE)/api --source-path $(subst $(space),$(pathsep),$(strip $(JAVADOC_SRCS))) -subpackages $(JAVADOC_PACKAGES)
 
-# Make variables used to replace spaces by a separator, typically in order to generate classpaths
-# for example: CLASSPATH = $(subst $(space),$(pathsep),$(strip $(JARS)))
-null  :=
-space := $(null) #
-pathsep := :
-
 .PHONY: osgi manifests javadoc osgi-all osgi-clean osgi-install osgi-uninstall jni-all jni-clean jni-install jni-uninstall