civodul pushed a commit to tag 1.8
in repository guix.
commit 5c4d2dab99d9a8c18055fda25678e055ef6ef168
Author: Eelco Dolstra <[email protected]>
Date: Thu Sep 11 16:24:26 2014 +0200
Fix JAR installation
---
jars.mk | 4 ++--
lib.mk | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/jars.mk b/jars.mk
index abe3f9f..a111783 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 31308de..fd39d35 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
