/hg/icedtea-web: Fixed evaluation of keysotre variable (Michal V...

[jvanek at icedtea.classpath.org]

changeset e53bdf5bdf98 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e53bdf5bdf98
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Mar 01 12:09:07 2019 +0100

	Fixed evaluation of keysotre variable (Michal Vala)


diffstat:

 Makefile.am |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r fd991e531f45 -r e53bdf5bdf98 Makefile.am
--- a/Makefile.am	Fri Mar 01 10:16:01 2019 +0100
+++ b/Makefile.am	Fri Mar 01 12:09:07 2019 +0100
@@ -1348,8 +1348,8 @@
 	if  which cygpath  ; then \
 	  export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
 	fi ; \
-	keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
-	[ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \
+	keystoredir=`dirname $$PUBLIC_KEYSTORE`; \
+	[ ! -d $$keystoredir ] && mkdir -p $$keystoredir; \
 	for which in "$${types[@]}" ; do \
 	  $(SYSTEM_JDK_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \
 	done ;
@@ -1370,8 +1370,8 @@
 	if  which cygpath  ; then \
 	  export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
 	fi ; \
-	keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
-	[ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \
+	keystoredir=`dirname $$PUBLIC_KEYSTORE`; \
+  [ ! -d $$keystoredir ] && mkdir -p $$keystoredir; \
 	for which in "$${types[@]}" ; do \
 	  yes | $(SYSTEM_JDK_DIR)/bin/keytool -import -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) -file $(EXPORTED_TEST_CERT_PREFIX)_$$which.$(EXPORTED_TEST_CERT_SUFFIX) ;\
 	done ;
@@ -1388,8 +1388,8 @@
 	if  which cygpath  ; then \
 	  export PUBLIC_KEYSTORE=$$(cygpath -p -m "$$PUBLIC_KEYSTORE") ; \
 	fi ; \
-	keystoredir=`dirname $(PUBLIC_KEYSTORE)`; \
-	[ ! -d $(keystoredir) ] && mkdir -p $(keystoredir); \
+	keystoredir=`dirname $$PUBLIC_KEYSTORE`; \
+  [ ! -d $$keystoredir ] && mkdir -p $$keystoredir; \
 	for which in "$${types[@]}" ; do \
 	  $(SYSTEM_JDK_DIR)/bin/keytool -delete -alias $(TEST_CERT_ALIAS)_$$which -keystore $$PUBLIC_KEYSTORE -storepass $(PUBLIC_KEYSTORE_PASS) ; \
 	done ;