about summary refs log tree commit diff
path: root/jars.mk
diff options
context:
space:
mode:
Diffstat (limited to 'jars.mk')
-rw-r--r--jars.mk4
1 files changed, 2 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