X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=common.mk;h=46b03984697b9a2ce6049b2f36a5af5a1fb7e778;hb=7896b2e157fd8191aa4e8e8b6bc5c9999a032082;hp=9f0cf2e3af1f368a76810cb5624d097338776d86;hpb=bfe072b7357dfa0559013fe00602e5295b07e498;p=cc0%2Fargeo-build.git diff --git a/common.mk b/common.mk index 9f0cf2e..46b0398 100644 --- a/common.mk +++ b/common.mk @@ -2,15 +2,12 @@ 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 -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 \ No newline at end of file