From 00caf6b66896d56031786b7a44820b4fa24598b4 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Mon, 29 Jan 2018 13:21:01 +0100 Subject: [PATCH] use $(shell) script to test GNU tar only when building under UNIX (linux, *BSD, etc.) --- src/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 97646866..1ae97d02 100644 --- a/src/Makefile +++ b/src/Makefile @@ -53,9 +53,7 @@ endif PLATFORMOBJ = TAR = tar -TARTRANSFORM = $(shell if $(TAR) --version | grep 'GNU tar' > /dev/null ; then \ - echo "--strip=1 --transform 's,^,grafx2/,g'" ; else \ - echo "-s '/\.\./grafx2/'" ; fi ) +TARTRANSFORM = --strip=1 --transform 's,^,grafx2/,g' # There is no uname under windows, but we can guess we are there with the COMSPEC env.var # Windows specific @@ -309,6 +307,9 @@ endif RMDIR = rmdir --ignore-fail-on-non-empty CP = cp ZIP = zip + TARTRANSFORM = $(shell if $(TAR) --version | grep 'GNU tar' > /dev/null ; then \ + echo "--strip=1 --transform 's,^,grafx2/,g'" ; else \ + echo "-s '/\.\./grafx2/'" ; fi ) PLATFORMFILES = ../share/grafx2/gfx2.png ifneq ($(ATARICROSS),1) ifeq ($(NOLUA),1)