Merge tag 'v2.3.6' into testing

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

diff --git a/osgi.mk b/osgi.mk
index 40946d5d660ac3a34e4b0ad3aae03f95bafed7cd..52bdba6443406c039693cb49fc232f7ac77d3ef5 100644 (file)
--- a/osgi.mk
+++ b/osgi.mk
@@ -78,8 +78,13 @@ clean-manifests :
 
 osgi-install:
        $(ARGEO_MAKE) \
-        install --category $(A2_CATEGORY) --bundles $(subst $(A2_CATEGORY)/,,$*) \
-        --target $(DESTDIR)$(A2_INSTALL_TARGET)
+        install --category $(A2_CATEGORY) --bundles $(BUNDLES) \
+        --target $(A2_INSTALL_TARGET)
+
+osgi-uninstall:
+       $(ARGEO_MAKE) \
+        uninstall --category $(A2_CATEGORY) --bundles $(BUNDLES) \
+        --target $(A2_INSTALL_TARGET)
 
 # Javadoc generation
 javadoc: $(BUILD_BASE)/built