Improve native install

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

diff --git a/common.mk b/common.mk
index 2ef806336bcc267ecfe299abf0c11b49bb817970..5ba68deeb9c903ec884baa1fc6ebcd1d7334f057 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -2,12 +2,22 @@ build-major=2
 build-minor=3
 
 # Required third party libraries
-ECJ_BRANCH=3.32
+ECJ_MAJOR=3
 BNDLIB_BRANCH=5.3
 SYSLOGGER_BRANCH=$(build-major).$(build-minor)
 
 # GNU defaults
 prefix ?= /usr/local
 datarootdir ?= $(prefix)/share
+libdir ?= $(exec_prefix)/lib
 
-A2_INSTALL_TARGET ?= $(datarootdir)/a2
\ No newline at end of file
+A2_INSTALL_TARGET ?= $(DESTDIR)$(datarootdir)/a2
+A2_NATIVE_INSTALL_TARGET ?= $(DESTDIR)$(libdir)/a2
+
+# OS-speciific
+OS_CATEGORY_PREFIX=lib/linux
+ARCH_CATEGORY_PREFIX=$(OS_CATEGORY_PREFIX)/$(shell uname -m)
+
+PORTABLE_CATEGORIES=$(filter-out $(OS_CATEGORY_PREFIX)/%, $(CATEGORIES))
+ARCH_CATEGORIES=$(filter $(ARCH_CATEGORY_PREFIX)/%, $(CATEGORIES))
+OS_CATEGORIES=$(filter-out $(ARCH_CATEGORY_PREFIX)/%, $(filter $(OS_CATEGORY_PREFIX)/%, $(CATEGORIES)))
\ No newline at end of file