[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
179/376: Fix JAR installation
From: |
Ludovic Courtès |
Subject: |
179/376: Fix JAR installation |
Date: |
Wed, 28 Jan 2015 22:04:52 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 5c4d2dab99d9a8c18055fda25678e055ef6ef168
Author: Eelco Dolstra <address@hidden>
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
- 174/376: build-remote.pl: UTF-8-decode errors, (continued)
- 174/376: build-remote.pl: UTF-8-decode errors, Ludovic Courtès, 2015/01/28
- 180/376: Don't rely on process substitution, Ludovic Courtès, 2015/01/28
- 177/376: Improved support for building JARs, Ludovic Courtès, 2015/01/28
- 187/376: Drop reference to FreeBSD, Ludovic Courtès, 2015/01/28
- 189/376: Tweak some chapter titles, Ludovic Courtès, 2015/01/28
- 175/376: Hack to prevent Makefile.config from being regenerated by "make clean", Ludovic Courtès, 2015/01/28
- 186/376: Remove pointless "license" section, Ludovic Courtès, 2015/01/28
- 190/376: Undocument NIX_OTHER_STORES, Ludovic Courtès, 2015/01/28
- 184/376: Nicer file names for the release notes, Ludovic Courtès, 2015/01/28
- 198/376: Derive Emacs nix-mode from prog-mode., Ludovic Courtès, 2015/01/28
- 179/376: Fix JAR installation,
Ludovic Courtès <=
- 194/376: Style tweak, Ludovic Courtès, 2015/01/28
- 192/376: Fix references to version.txt, Ludovic Courtès, 2015/01/28
- 188/376: Drop "service deployment" bla bla, Ludovic Courtès, 2015/01/28
- 185/376: Release notes: Use a section per version, Ludovic Courtès, 2015/01/28
- 191/376: Drop separate release notes, Ludovic Courtès, 2015/01/28
- 199/376: Settings: Add bool get(), Ludovic Courtès, 2015/01/28
- 193/376: Fix parallel make of manpages, Ludovic Courtès, 2015/01/28
- 195/376: Make troubleshooting an appendix, Ludovic Courtès, 2015/01/28
- 197/376: Remove unhelpful suggestion, Ludovic Courtès, 2015/01/28
- 196/376: Delete bugs.xml, Ludovic Courtès, 2015/01/28