[PATCH 2/5] libgloss: merge doc into top-level Makefile

[Mike Frysinger]

Avoid a recursive make with this tiny subdir to speed things up a bit.
---
 libgloss/Makefile.am      |   7 +
 libgloss/Makefile.in      | 403 +++++++++++++++++++++++++++++++++-----
 libgloss/configure        |  22 ++-
 libgloss/configure.ac     |   7 +-
 libgloss/doc/Makefile.in  | 175 -----------------
 libgloss/doc/Makefile.inc |   1 +
 6 files changed, 388 insertions(+), 227 deletions(-)
 delete mode 100644 libgloss/doc/Makefile.in
 create mode 100644 libgloss/doc/Makefile.inc

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index 0779da76dd76..81ba50a70f8c 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -3,6 +3,7 @@
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 
 # Variables that will accumulate in subdirs.
+info_TEXINFOS =
 PHONY =
 
 SUBDIRS = @subdirs@ .
@@ -36,3 +37,9 @@ FLAGS_TO_PASS = \
 	"DESTDIR=$(DESTDIR)"
 
 include $(top_srcdir)/../multilib.am
+
+TEXINFO_TEX = ../texinfo/texinfo.tex
+
+if HAVE_DOC
+include doc/Makefile.inc
+endif
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index e4f0b50860b6..5657f094a197 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -13,9 +13,12 @@ AC_PROG_INSTALL
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([foreign no-dist no-define subdir-objects 1.15.1])
 
-if test -z "${with_multisubdir}" ; then
-  AC_CONFIG_FILES([doc/Makefile])
+if test -z "${with_multisubdir}"; then
+  have_multisubdir=no
+else
+  have_multisubdir=yes
 fi
+AM_CONDITIONAL(HAVE_DOC, test x$have_multisubdir = xno)
 
 AC_NO_EXECUTABLES
 
diff --git a/libgloss/doc/Makefile.inc b/libgloss/doc/Makefile.inc
new file mode 100644
index 000000000000..fa5e30fbf2bc
--- /dev/null
+++ b/libgloss/doc/Makefile.inc
@@ -0,0 +1 @@
+info_TEXINFOS += %D%/porting.texi
-- 
2.34.1