# HG changeset patch # User Jiri Vanek # Date 1551292748 -3600 # Node ID addc4150a4e9ca4050696a3f557c82dcbd10ccaf # Parent 49cb60f2ad775726185235cf687e9898c13a3c8a Fixed call to which (ps: never call withch at night!) diff -r 49cb60f2ad77 -r addc4150a4e9 Makefile.am --- a/Makefile.am Wed Feb 27 19:15:28 2019 +0100 +++ b/Makefile.am Wed Feb 27 19:39:08 2019 +0100 @@ -1274,7 +1274,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 ; \ @@ -1289,7 +1289,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)) ; \ @@ -1348,7 +1348,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)`; \ @@ -1370,7 +1370,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)`; \ @@ -1388,7 +1388,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)`; \