diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-11T14·24+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-11T14·24+0200 |
| commit | 5c4d2dab99d9a8c18055fda25678e055ef6ef168 (patch) | |
| tree | a8d33b0cc11b3e8cb7e38aebfee9487e732a90da | |
| parent | 9648222ef0ad7cd4478d61c3ffd6fe9926a859df (diff) | |
Fix JAR installation
| -rw-r--r-- | jars.mk | 4 | ||||
| -rw-r--r-- | lib.mk | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/jars.mk b/jars.mk index abe3f9fe5bb7..a11178342e54 100644 --- a/jars.mk +++ b/jars.mk @@ -10,7 +10,7 @@ define build-jar _jars := $$(foreach jar, $$($(1)_JARS), $$($$(jar)_PATH)) - $$($(1)_PATH): $$($(1)_SOURCES) $$(_jars) + $$($(1)_PATH): $$($(1)_SOURCES) $$(_jars) $$($(1)_EXTRA_DEPS)| $$($(1)_ORDER_AFTER) @rm -rf $$($(1)_TMPDIR) @mkdir -p $$($(1)_TMPDIR) $$(trace-javac) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) \ @@ -19,7 +19,7 @@ define build-jar $$(trace-jar) jar cfm $$($(1)_PATH) <(echo -e '$$(subst $$(newline),\n,$$($(1)_MANIFEST))') -C $$($(1)_TMPDIR) . @rm -rf $$($(1)_TMPDIR) - $(1)_INSTALL_DIR ?= $$(libdir)/java + $(1)_INSTALL_DIR ?= $$(jardir) $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).jar diff --git a/lib.mk b/lib.mk index 31308deaa886..fd39d35bbe2b 100644 --- a/lib.mk +++ b/lib.mk @@ -36,6 +36,7 @@ libdir ?= $(prefix)/lib bindir ?= $(prefix)/bin libexecdir ?= $(prefix)/libexec datadir ?= $(prefix)/share +jardir ?= $(datadir)/java localstatedir ?= $(prefix)/var sysconfdir ?= $(prefix)/etc mandir ?= $(prefix)/share/man |