Properly deploy OS-specific jars

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

diff --git a/common.mk b/common.mk
index 95813d453d585a2350c22ed3bf9fd35137274577..c30d011faa8fc4750b69e07e29c33ce68cf83f68 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -32,13 +32,15 @@ KNOWN_ARCHS ?= x86_64 aarch64
 TARGET_OS ?= linux
 TARGET_ARCH ?= $(shell uname -m)
 
-TARGET_OS_CATEGORY_PREFIX=lib/linux
+TARGET_OS_CATEGORY_PREFIX=lib/$(TARGET_OS)
 TARGET_ARCH_CATEGORY_PREFIX=$(TARGET_OS_CATEGORY_PREFIX)/$(TARGET_ARCH)
 PORTABLE_CATEGORIES=$(filter-out lib/%, $(CATEGORIES))
 ARCH_CATEGORIES=$(filter $(TARGET_ARCH_CATEGORY_PREFIX)/%, $(CATEGORIES))
 OS_CATEGORIES=$(filter-out $(foreach arch, $(KNOWN_ARCHS), $(TARGET_OS_CATEGORY_PREFIX)/$(arch)/%), $(filter $(TARGET_OS_CATEGORY_PREFIX)/%, $(CATEGORIES)))
 
 # Utilities
+INSTALL=install -m644 -D --target-directory
+
 # Make variables used to replace spaces by a separator, typically in order to generate classpaths
 # for example: CLASSPATH = $(subst $(space),$(pathsep),$(strip $(JARS)))
 null  :=