From a4eeb5323ac00cd6dbbb571a738bf2ee9f8ef209 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 19 Nov 2011 19:53:57 +0100
Subject: [PATCH] texinfo: work around Solaris 10 xpg4 shell bug in install
 rules

* lib/am/texinfos.am (install-html-am): Use an extra variable
indirection to work around a bug in Solaris 10 /usr/xpg4/bin/sh.
Bug revealed by a failure of `txinfo21.test'.  See also:
<http://lists.gnu.org/archive/html/bug-autoconf/2011-11/msg00005.html>
<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10026#23>
---
 ChangeLog          |  9 +++++++++
 lib/am/texinfos.am | 14 ++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50aac4f1b..a828c2174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	texinfo: work around Solaris 10 xpg4 shell bug in install rules
+	* lib/am/texinfos.am (install-html-am): Use an extra variable
+	indirection to work around a bug in Solaris 10 /usr/xpg4/bin/sh.
+	Bug revealed by a failure of `txinfo21.test'.  See also:
+	<http://lists.gnu.org/archive/html/bug-autoconf/2011-11/msg00005.html>
+	<http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10026#23>
+
 2011-11-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	configure: report perl version in config.log
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 80712cf4c..5314dec8d 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -161,13 +161,19 @@ install-html-am: $(HTMLS)
 	for p in $$list; do \
 	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  $(am__strip_dir) \
-	  if test -d "$$d$$p"; then \
+## This indirection is required to work around a bug of the Solaris 10
+## shell /usr/xpg4/bin/sh.  The description of the bug can be found at
+## <http://lists.gnu.org/archive/html/bug-autoconf/2011-11/msg00005.html>
+## and the report of the original failure can be found at automake
+## bug#10026 <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10026#23>
+	  d2=$$d$$p; \
+	  if test -d "$$d2"; then \
 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
 	  else \
-	    list2="$$list2 $$d$$p"; \
+	    list2="$$list2 $$d2"; \
 	  fi; \
 	done; \
 	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
-- 
2.47.2