projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a0fb115
)
Improve repackage install
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 6 Mar 2024 08:46:28 +0000
(09:46 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 6 Mar 2024 08:46:28 +0000
(09:46 +0100)
repackage.mk
patch
|
blob
|
history
diff --git
a/repackage.mk
b/repackage.mk
index 6f9eeec1af91c9ae9460414eb849e9b03ffbc146..5e056d69c4d214a79bb1d72748f6eaf75df9b3a2 100644
(file)
--- a/
repackage.mk
+++ b/
repackage.mk
@@
-19,14
+19,13
@@
REPACKAGED_CATEGORIES = $(foreach category, $(CATEGORIES),$(A2_OUTPUT)/$(categor
all: $(BUILD_BASE)/repackaged
install:
all: $(BUILD_BASE)/repackaged
install:
- @$(foreach category, $(PORTABLE_CATEGORIES),
mkdir -p $(A2_INSTALL_TARGET)/$(category); cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);
)
+ @$(foreach category, $(PORTABLE_CATEGORIES),
install -D $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category)
)
@echo Installed portable jars '$(PORTABLE_CATEGORIES)' to $(A2_INSTALL_TARGET)
@echo Installed portable jars '$(PORTABLE_CATEGORIES)' to $(A2_INSTALL_TARGET)
- @$(foreach category, $(OS_CATEGORIES),
mkdir -p $(A2_INSTALL_TARGET)/$(category); cp $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category);
)
+ @$(foreach category, $(OS_CATEGORIES),
install -D $(A2_OUTPUT)/$(category)/*.jar $(A2_INSTALL_TARGET)/$(category)
)
@echo Installed OS-dependent jars '$(OS_CATEGORIES)' to $(A2_INSTALL_TARGET)
@echo Installed OS-dependent jars '$(OS_CATEGORIES)' to $(A2_INSTALL_TARGET)
- mkdir -p $(A2_NATIVE_INSTALL_TARGET)
- @$(foreach category, $(ARCH_CATEGORIES), mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(category); cp $(A2_OUTPUT)/$(category)/*.jar $(A2_NATIVE_INSTALL_TARGET)/$(category);)
+ @$(foreach category, $(ARCH_CATEGORIES), install -D $(A2_OUTPUT)/$(category)/*.jar $(subst, $(TARGET_ARCH_CATEGORY_PREFIX)/,, $(category)))
@echo Installed arch-dependent jars '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
@echo Installed arch-dependent jars '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
- @$(foreach category, $(ARCH_CATEGORIES),
cp
$(A2_OUTPUT)/$(category)/*.so $(A2_NATIVE_INSTALL_TARGET);)
+ @$(foreach category, $(ARCH_CATEGORIES),
install -D
$(A2_OUTPUT)/$(category)/*.so $(A2_NATIVE_INSTALL_TARGET);)
@echo Installed arch binaries '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
uninstall:
@echo Installed arch binaries '$(ARCH_CATEGORIES)' to $(A2_NATIVE_INSTALL_TARGET)
uninstall: