diff make/common/JarArchive.gmk @ 47290:b90a1b5b8142

manual merge
author mcimadamore
date Mon, 25 Sep 2017 16:38:40 +0100
parents 59bdd7243c52
children 1c1118deeedb
line wrap: on
line diff
--- a/make/common/JarArchive.gmk	Mon Sep 25 15:37:25 2017 +0100
+++ b/make/common/JarArchive.gmk	Mon Sep 25 16:38:40 2017 +0100
@@ -211,7 +211,7 @@
   $1_SUPDATE_CONTENTS=$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
 
   # Use a slightly shorter name for logging, but with enough path to identify this jar.
-  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
+  $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_JAR))
 
   ifneq (,$$($1_CHECK_COMPRESS_JAR))
     $1_JAR_CREATE_OPTIONS := c0fm