summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--doc/Makefile.am10
-rw-r--r--doc/html.init (renamed from doc/Config)10
m---------gint0
m---------grecs0
-rw-r--r--src/Makefile.am4
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
@@ -45,15 +45,15 @@ EXTRA_DIST = sample.conf GNUmakefile togit.scm
.conf.texi:
sed '/^#/d;s/\([{}@]\)/@\1/g' $< > $@
-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)
include ../imprimatur/imprimatur.mk
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)'
# Make sure you set TEXINPUTS.
# TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions
@@ -61,8 +61,8 @@ TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
manual:
TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
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'
# Checking
check-options:
diff --git a/doc/Config b/doc/html.init
index e3d8942..7613faa 100644
--- a/doc/Config
+++ b/doc/html.init
@@ -78,12 +78,10 @@ set_from_init_file('PROGRAM_NAME_IN_FOOTER',1);
set_from_init_file('DEFAULT_RULE', '');
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
set_from_init_file('ICONS', 1);
@@ -152,9 +150,11 @@ my @gray_buttons = (\&gray_document_title, ' ',
'FastBack', ' ', 'Up', ' ', 'FastForward', ' ',
'Contents', 'Index' );
+set_from_init_file('TOP_BUTTONS', undef);
set_from_init_file('SECTION_BUTTONS', \@gray_buttons);
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',
[\&gray_document_title,
'Contents',
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,5 +1,5 @@
# This file is part of cfpeek
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011,2015 Sergey Poznyakoff
#
# Cfpeek is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -28,8 +28,8 @@ cfpeek_SOURCES = \
script.c
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)"
BUILT_SOURCES = cmdline.h

Return to:

Send suggestions and report system problems to the System administrator.