Improve native install

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

diff --git a/common.mk b/common.mk
index 9f0cf2e3af1f368a76810cb5624d097338776d86..5ba68deeb9c903ec884baa1fc6ebcd1d7334f057 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -2,15 +2,22 @@ build-major=2
 build-minor=3
 
 # Required third party libraries
-ECJ_BRANCH=4.26
+ECJ_MAJOR=3
 BNDLIB_BRANCH=5.3
 SYSLOGGER_BRANCH=$(build-major).$(build-minor)
 
-#A2_BASE=/home/mbaudier/dev/git/unstable/output/a2 /home/mbaudier/dev/git/unstable/argeo-qa/build/argeo/output/a2 test
+# GNU defaults
+prefix ?= /usr/local
+datarootdir ?= $(prefix)/share
+libdir ?= $(exec_prefix)/lib
 
-find-build-tp:
-       $(lastword $(foreach base, $(A2_BASE), $(wildcard $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar)))
-       ##$(eval LOGGER_JAR = $(shell if [ -f $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar ]; then echo $(base)/org.argeo.tp/org.argeo.tp.syslogger.$(SYSLOGGER_BRANCH).jar; fi)) \
-       #)
-#      $(if $(wildcard $(candidate)), $(eval LOGGER_JAR = $(candidate))) \     
-       echo $(LOGGER_JAR)
\ 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