Merge branch 'feature/upstream' into develop

1 files changed, 13 insertions, 10 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index de7647e..3f33218 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the doc subdirectory of GNU libunistring.
-## Copyright (C) 2009, 2011, 2017 Free Software Foundation, Inc.
+## Copyright (C) 2009, 2011, 2014, 2017-2019 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in.
 
@@ -23,9 +23,11 @@ MOSTLYCLEANFILES =
 # List of -I options referring to directories that contain texinfo sources
 # used by this directory.
 # Should contain at least one -I option, to work around a bug in texi2dvi 1.13,
-# see <http://lists.gnu.org/archive/html/bug-automake/2009-04/msg00029.html>.
+# see <https://lists.gnu.org/archive/html/bug-automake/2009-04/msg00029.html>.
 TEXINCLUDES = -I .
 
+RM = rm -f
+
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
 MAKEINFOFLAGS = $(TEXINCLUDES) --no-split
 
@@ -34,15 +36,14 @@ info_TEXINFOS = libunistring.texi
 libunistring_TEXINFOS = \
   unitypes.texi unistr.texi uniconv.texi unistdio.texi uniname.texi \
   unictype.texi uniwidth.texi unigbrk.texi uniwbrk.texi unilbrk.texi \
-  uninorm.texi unicase.texi uniregex.texi wchar_t.texi \
+  uninorm.texi unicase.texi uniregex.texi wchar_t.texi char32_t.texi \
   gpl.texi lgpl.texi fdl.texi
 
 # The dependencies of stamp-vti generated by automake are incomplete.
 # So we have to duplicate the entire rule which would otherwise be generated
 # by automake.
 $(srcdir)/stamp-vti: $(info_TEXINFOS) $(libunistring_TEXINFOS) $(top_srcdir)/version.sh
-	(dir=.; test -f ./libunistring.texi || dir=$(srcdir); \
-	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/libunistring.texi`; \
+	(set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $(srcdir)/libunistring.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -136,17 +137,19 @@ html-split: libunistring_toc.html
 # Override of automake's definition.
 # We want to use texi2html, not makeinfo --html.
 libunistring.html: libunistring.texi version.texi $(libunistring_TEXINFOS)
-	$(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -monolithic `if test -f libunistring.texi; then echo libunistring.texi; else echo $(srcdir)/libunistring.texi; fi`
+	$(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -monolithic $(srcdir)/libunistring.texi
 
 libunistring_toc.html: libunistring.texi version.texi $(libunistring_TEXINFOS)
 	case "@PERL@" in \
 	  *"/missing perl") \
-	     $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -split_chapter `if test -f libunistring.texi; then echo libunistring.texi; else echo $(srcdir)/libunistring.texi; fi` || exit 0 ;; \
+	     $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -split_chapter $(srcdir)/libunistring.texi || exit 0 ;; \
 	  *) $(RM) libunistring_*.html ; \
-	     $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -split_chapter `if test -f libunistring.texi; then echo libunistring.texi; else echo $(srcdir)/libunistring.texi; fi` ;; \
+	     $(TEXI2HTML) $(TEXINCLUDES) -no-sec-nav -no-menu -toc-links -number -split_chapter $(srcdir)/libunistring.texi ;; \
 	esac \
 	&& { mv libunistring/libunistring.html libunistring_toc.html; \
-	     mv libunistring/*.html .; \
+	     for file in libunistring/*.html; do \
+	       sed -e 's/libunistring\.html/libunistring_toc.html/g' < $$file > `basename $$file` && rm -f $$file; \
+	     done; \
 	     rmdir libunistring; \
 	   }