install for repackage

diff --git a/common.mk b/common.mk
index 2ef806336bcc267ecfe299abf0c11b49bb817970..bc1fa82b0cc89a950f146a52116154050d119a02 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -10,4 +10,4 @@ SYSLOGGER_BRANCH=$(build-major).$(build-minor)
 prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
 
-A2_INSTALL_TARGET ?= $(datarootdir)/a2
\ No newline at end of file
+A2_INSTALL_TARGET ?= $(DESTDIR)$(datarootdir)/a2
\ No newline at end of file

diff --git a/osgi.mk b/osgi.mk
index 7b92dd8c8c4f40a309241407a099776da53f0e7b..52bdba6443406c039693cb49fc232f7ac77d3ef5 100644 (file)
--- a/osgi.mk
+++ b/osgi.mk
@@ -79,12 +79,12 @@ clean-manifests :
 osgi-install:
        $(ARGEO_MAKE) \
         install --category $(A2_CATEGORY) --bundles $(BUNDLES) \
-        --target $(DESTDIR)$(A2_INSTALL_TARGET)
+        --target $(A2_INSTALL_TARGET)
 
 osgi-uninstall:
        $(ARGEO_MAKE) \
         uninstall --category $(A2_CATEGORY) --bundles $(BUNDLES) \
-        --target $(DESTDIR)$(A2_INSTALL_TARGET)
+        --target $(A2_INSTALL_TARGET)
 
 # Javadoc generation
 javadoc: $(BUILD_BASE)/built

diff --git a/repackage.mk b/repackage.mk
index 80ee92564ba59b9c5806843a9f706a76c3aa11b9..8c3beb6402576e38b47e251cdc83041c6f8e9485 100644 (file)
--- a/repackage.mk
+++ b/repackage.mk
@@ -25,9 +25,16 @@ BNDLIB_JAR ?= $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.arge
 ARGEO_REPACKAGE = $(JVM) -cp $(LOGGER_JAR):$(BNDLIB_JAR) $(ARGEO_BUILD_BASE)src/org/argeo/build/Repackage.java
 TODOS_REPACKAGE = $(foreach category, $(CATEGORIES),$(BUILD_BASE)/$(category)/to-repackage) 
 BUILD_BASE = $(SDK_BUILD_BASE)/$(shell basename $(SDK_SRC_BASE))
+REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(category))
 
 all: $(BUILD_BASE)/repackaged 
 
+install:
+       $(foreach category, $(CATEGORIES), mkdir -p $(A2_INSTALL_TARGET)/$(category);  cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);)
+
+uninstall:
+       $(foreach category, $(CATEGORIES), rm -rf $(A2_INSTALL_TARGET)/$(category);)
+
 .SECONDEXPANSION:
 # We use .SECONDEXPANSION and CATEGORIES_TO_REPACKAGE instead of directly CATEGORIES
 # so that we don't repackage a category if it hasn't changed