Merge tag 'v2.3.6' into testing

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

diff --git a/osgi.mk b/osgi.mk
index 17b7c013e073d64c5712496d52076b392d6fa0ca..52bdba6443406c039693cb49fc232f7ac77d3ef5 100644 (file)
--- a/osgi.mk
+++ b/osgi.mk
@@ -76,11 +76,15 @@ endif
 clean-manifests :
        @rm -rf $(foreach bundle, $(BUNDLES), $(bundle)/META-INF/MANIFEST.MF);
 
-osgi-install: BUNDLES_TO_BUILD = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-build,, $?))
 osgi-install:
        $(ARGEO_MAKE) \
-        install --category $(A2_CATEGORY) --bundles $(BUNDLES_TO_BUILD) \
-        --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