Fix makefiles, upgrade submodules, fix docbuild

* gint: Upgrade.
* grecs: Upgrade.
* src/Makefile.am: Remove obsolete use of INCLUDES
* doc/Makefile.am: Use Makeinfo 5 instead of texi2html
* doc/Config: Rename to doc/html.init.

5 files changed, 12 insertions, 12 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 134a489..b8021fb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -47,3 +47,3 @@ EXTRA_DIST = sample.conf GNUmakefile togit.scm
 
-AM_MAKEINFOFLAGS = @IMPRIMATUR_MAKEINFOFLAGS@  -I$(top_srcdir)/@GRECS_SUBDIR@/doc
+AM_MAKEINFOFLAGS = @IMPRIMATUR_MAKEINFOFLAGS@  -I $(top_srcdir)/@GRECS_SUBDIR@/doc
 imprimatur_INPUT=$(info_TEXINFOS) $(cfpeek_TEXINFOS)
@@ -52,6 +52,6 @@ CHECK_DOCS=$(top_srcdir)/@IMPRIMATUR_MODULE_DIR@/check-docs.sh
 
-GENDOCS=$(srcdir)/gendocs.sh
+GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
 EXTRA_DIST += gendocs.sh
 
-TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
+TEXI2DVI=texi2dvi -t '@set $(RENDITION)'
 
@@ -63,4 +63,4 @@ manual:
          MAKEINFO="$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)" \
-         TEXI2DVI="$(TEXI2DVI) -t @finalout" \
-         $(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual'
+         TEXI2DVI="$(TEXI2DVI) -E" \
+         $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
 
diff --git a/doc/Config b/doc/html.init
index e3d8942..7613faa 100644
--- a/doc/Config
+++ b/doc/html.init
@@ -80,8 +80,6 @@ set_from_init_file('BIG_RULE', '');
 
-# Turn off footer buttons in section split
-set_from_init_file('SECTION_FOOTER_BUTTONS', undef);
-#set_from_init_file('SECTION_BUTTONS', undef);
-# Turn off navigation bars at the bottom of each section in chapter split mode
+# Turn off navigation bars at the bottom of each section in chapter split mode,
+# or subsection in section split mode.
 set_from_init_file('HEADERS', undef)
-    if (get_conf('SPLIT') and (get_conf('SPLIT') eq 'chapter'));
+    if ((get_conf('SPLIT') eq 'chapter') or (get_conf('SPLIT') eq 'section'));
 # Use navigation icons
@@ -154,2 +152,3 @@ my @gray_buttons = (\&gray_document_title, ' ',
 
+set_from_init_file('TOP_BUTTONS', undef);
 set_from_init_file('SECTION_BUTTONS', \@gray_buttons);
@@ -157,2 +156,3 @@ set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons);
 set_from_init_file('NODE_FOOTER_BUTTONS', \@gray_buttons);
+set_from_init_file('SECTION_FOOTER_BUTTONS', \@gray_buttons);
 set_from_init_file('MISC_BUTTONS',
diff --git a/gint b/gint
-Subproject b39efd37a7fbf478072c72f82b4310c8620a4ce
+Subproject fd86bf7d44b0c970771830692ae7491447ebe8b
diff --git a/grecs b/grecs
-Subproject 83a06bbc6b3796a0b8646816da34c6672488cbf
+Subproject b9df6a46ac8bd1dcbb3a3061fed4d86d739be21
diff --git a/src/Makefile.am b/src/Makefile.am
index 061956c..0cf6a08 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 # This file is part of cfpeek
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011,2015 Sergey Poznyakoff
 #
@@ -30,4 +30,4 @@ cfpeek_SOURCES = \
 LDADD=@GRECS_LDADD@ @GUILE_LIBS@
-INCLUDES = -I$(top_srcdir) @GRECS_INCLUDES@ @GUILE_INCLUDES@
 AM_CPPFLAGS= \
+ -I$(top_srcdir) @GRECS_INCLUDES@ @GUILE_INCLUDES@\
  -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)"