# HG changeset patch # User Jiri Vanek # Date 1551712564 -3600 # Node ID 9b54fcdec9bc0ad72777efdb27eca96b762670cc # Parent 358be410039df4aacbcb857a849d1a52941d286c Fixed call to which (ps: never call withch at night!) diff -r 358be410039d -r 9b54fcdec9bc Makefile.am --- a/Makefile.am Mon Mar 04 16:15:37 2019 +0100 +++ b/Makefile.am Mon Mar 04 16:16:04 2019 +0100 @@ -1173,7 +1173,7 @@ then \ export TMP_MANIFEST=`mktemp` ; \ echo "$$AN $$dir" > $$TMP_MANIFEST ; \ - if [ which cygpath ] ; then \ + if which cygpath ; then \ export TMP_MANIFEST=$(shell cygpath -p -m "$$TMP_MANIFEST") ; \ fi ; \ $(SYSTEM_JDK_DIR)/bin/jar ufm "$(REPRODUCERS_TESTS_SERVER_DEPLOYDIR)/$$dir.jar" $$TMP_MANIFEST ; \ @@ -1188,7 +1188,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 \ + if which cygpath ; then \ export keystore=$(shell cygpath -p -m "$$keystore") ; \ fi ; \ types=($(SIGNED_REPRODUCERS)) ; \ @@ -1247,7 +1247,7 @@ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ - if [ which cygpath ] ; then \ + if which cygpath ; then \ export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \ fi ; \ keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \ @@ -1269,7 +1269,7 @@ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ - if [ which cygpath ] ; then \ + if which cygpath ; then \ export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \ fi ; \ keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \ @@ -1287,7 +1287,7 @@ PUBLIC_KEYSTORE=${HOME}/.config ; \ fi ;\ export PUBLIC_KEYSTORE=$$PUBLIC_KEYSTORE/$(PUBLIC_KEYSTORE_STUB); \ - if [ which cygpath ] ; then \ + if which cygpath ; then \ export PUBLIC_KEYSTORE=$(shell cygpath -p -m "$$PUBLIC_KEYSTORE") ; \ fi ; \ keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \