From b6af2a6f8ec1f1963f6d33db0f8708b3a9cf3341 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Mon, 18 Jun 2018 08:54:14 +0200 Subject: [PATCH] Makefile: Fix jar/${JAR} --- Makefile.base | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.base b/Makefile.base index aeebcbd..70d6c01 100644 --- a/Makefile.base +++ b/Makefile.base @@ -3,6 +3,7 @@ # Version: # - 1.0.0: add a version comment # - 1.1.0: add help, sjar +# - 1.1.1: fix "jar" instead of ${JAR} # Required parameters (the commented out ones are supposed to change per project): @@ -76,10 +77,10 @@ clean: @for lib in libs/*-sources.jar libs/*-sources.patch.jar; do \ if [ "$$lib" != 'libs/*-sources.jar' -a "$$lib" != 'libs/*-sources.patch.jar' ]; then \ basename "$$lib"; \ - jar tf "$$lib" | while read -r ln; do \ + ${JAR} tf "$$lib" | while read -r ln; do \ [ -f "src/$$ln" ] && rm "src/$$ln"; \ done; \ - jar tf "$$lib" | tac | while read -r ln; do \ + ${JAR} tf "$$lib" | tac | while read -r ln; do \ [ -d "src/$$ln" ] && rmdir "src/$$ln" 2>/dev/null || true; \ done; \ fi \ @@ -122,7 +123,7 @@ libs: bin @[ -e bin/libs -o ! -d libs ] || (cd src && for lib in ../libs/*-sources.jar ../libs/*-sources.patch.jar; do \ if [ "$$lib" != '../libs/*-sources.jar' -a "$$lib" != '../libs/*-sources.patch.jar' ]; then \ basename "$$lib"; \ - jar xf "$$lib"; \ + ${JAR} xf "$$lib"; \ fi \ done ) @[ ! -d libs ] || touch bin/libs -- 2.27.0