Mercurial > hg > release > icedtea-web-1.8
changeset 1573:07f74a1ecc2d
cygpath is now called without shell and via $$(
author | Jiri Vanek <jvanek@redhat.com> |
---|---|
date | Thu, 28 Feb 2019 10:38:29 +0100 |
parents | addc4150a4e9 |
children | 16928468c234 |
files | Makefile.am |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Wed Feb 27 19:39:08 2019 +0100 +++ b/Makefile.am Thu Feb 28 10:38:29 2019 +0100 @@ -1275,7 +1275,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 ; \ @@ -1290,7 +1290,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 \ @@ -1349,7 +1349,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); \ @@ -1371,7 +1371,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); \ @@ -1389,7 +1389,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); \