Mercurial > hg > release > icedtea-web-1.6

changeset 1284:834746c2a271

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove bash-specifics from top level Makefile.am The == in the test comparison is not necessary, the = test works fine. Invoke html-gen.sh with 'sh' as opposed to 'bash' since it does not require bash. No reason to require bash when it is not needed. Tested with dash and zsh installed as /bin/sh.
author Jiri Vanek <jvanek@redhat.com>
date Thu, 07 Jan 2016 15:33:12 +0100
parents 090ff301b57d
children e017136a9c45
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 07 15:24:21 2016 +0100
+++ b/ChangeLog	Thu Jan 07 15:33:12 2016 +0100
@@ -1,3 +1,12 @@
+2016-01-07  David Cantrell <david.l.cantrell@gmail.com>
+            Jiri Vanek  <jvanek@redhat.com>
+            Andrew John Hughes  <ahughes@redhat.com>
+
+	Remove bash-specifics from top level Makefile.a
+	* Makefile.am: (generate-docs.stamp) double == in test function replaced by single =
+	(stamps/netx-html-gen.stamp) call to plain bash replaced by ${SHELL}
+	* NEWS: mentioned PR2669
+
 2016-01-07  Tiago Stürmer Daitx <tdaitx@gmail.com>
             Jiri Vanek  <jvanek@redhat.com>
 
--- a/Makefile.am	Thu Jan 07 15:24:21 2016 +0100
+++ b/Makefile.am	Thu Jan 07 15:33:12 2016 +0100
@@ -531,7 +531,7 @@
 	  $$TP_COMMAND html "$$HTML_DOCS_TARGET_DIR/$$ID" $$TP_TAIL ; \
 	  mkdir "$$PLAIN_DOCS_TARGET_DIR/$$ID" ; \
 	  $$TP_COMMAND plain "$$PLAIN_DOCS_TARGET_DIR/$$ID" 160 $$TP_TAIL; \
-	  if [ $$ID == "en" ] ; then \
+	  if [ $$ID = "en" ] ; then \
 	    MAN_DESC="$$MAN_DOCS_TARGET_DIR/man1" ; \
 	  else \
 	    MAN_DESC="$$MAN_DOCS_TARGET_DIR/$$ID/man1" ; \
@@ -549,7 +549,7 @@
 	mkdir -p html-gen; \
 	cp AUTHORS NEWS COPYING ChangeLog html-gen/; \
 	export HTML_GEN_DEBUG=true; \
-	bash html-gen.sh 40; \
+	${SHELL} html-gen.sh 40; \
 	unset HTML_GEN_DEBUG)
 	${INSTALL_DATA} $(NETX_SRCDIR)/../html-gen/*.html $(NETX_RESOURCE_DIR)
 	rm -r $(NETX_SRCDIR)/../html-gen/
--- a/NEWS	Thu Jan 07 15:24:21 2016 +0100
+++ b/NEWS	Thu Jan 07 15:33:12 2016 +0100
@@ -13,6 +13,7 @@
 * PR2779: html-gen.sh: Don't try to call hg if .hg directory isn't present
 * PR2591 - IcedTea-Web request resources twice for meta informations and causes ClientAbortException on tomcat in conjunction with JnlpDownloadServlet
 * PR2690 - Can't run BOM into JNLP file
+* PR2669 - remove bash-specific syntax from top level Makefile.am
 * NetX
   - main-class attribute trimmed by default
   - in strict mode, main-class attribute checked for invalid characters