changeset 1531:0c38cd91d022

cygpath is now called without shell and via $$(
author Jiri Vanek <jvanek@redhat.com>
date Mon, 04 Mar 2019 16:16:31 +0100
parents 9b54fcdec9bc
children db64b47db596
files Makefile.am
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Mon Mar 04 16:16:04 2019 +0100
+++ b/Makefile.am	Mon Mar 04 16:16:31 2019 +0100
@@ -1174,7 +1174,7 @@
 	       export TMP_MANIFEST=`mktemp` ; \
 	       echo "$$AN $$dir" > $$TMP_MANIFEST ; \
 	       if  which cygpath  ; then \
-	         export TMP_MANIFEST=$(shell cygpath -p -m "$$TMP_MANIFEST") ; \
+	         export TMP_MANIFEST=$$(cygpath -p -m "$$TMP_MANIFEST") ; \
 	       fi ; \
 	       $(SYSTEM_JDK_DIR)/bin/jar ufm "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar"  $$TMP_MANIFEST ; \
 	       rm -f $$TMP_MANIFEST ; \
@@ -1189,7 +1189,7 @@
 stamps/netx-dist-tests-sign-some-reproducers.stamp: stamps/netx-dist-tests-prepare-reproducers.stamp
 	export keystore=$(TOP_BUILD_DIR)/$(PRIVATE_KEYSTORE_NAME); \
 	if  which cygpath  ; then \
-	  export keystore=$(shell cygpath -p -m "$$keystore") ; \
+	  export keystore=$$(cygpath -p -m "$$keystore") ; \
 	fi ; \
 	types=($(SIGNED_REPRODUCERS)) ; \
 	for which in "$${types[@]}" ; do \
@@ -1248,7 +1248,7 @@
 	fi ;\
 	export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
 	if  which cygpath  ; then \
-	  export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
+	  export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
 	fi ; \
 	keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
 	[ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \
@@ -1270,7 +1270,7 @@
 	fi ;\
 	export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
 	if  which cygpath  ; then \
-	  export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
+	  export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
 	fi ; \
 	keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
 	[ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \
@@ -1288,7 +1288,7 @@
 	fi ;\
 	export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \
 	if  which cygpath  ; then \
-	  export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
+	  export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
 	fi ; \
 	keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
 	[ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \