summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2015-05-15 09:17:57 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2015-05-15 09:17:57 (GMT)
commit6ed15cc122e4f1f6281952a7b484ea038c73f816 (patch) (unidiff)
tree4061794595be3b1838bca38129f43080e922047e
parent448b11b3f51873392e916eec9dbe1dd11a96c72b (diff)
downloadcfpeek-6ed15cc122e4f1f6281952a7b484ea038c73f816.tar.gz
cfpeek-6ed15cc122e4f1f6281952a7b484ea038c73f816.tar.bz2
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.
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
45.conf.texi: 45.conf.texi:
46 sed '/^#/d;s/\([{}@]\)/@\1/g' $< > $@ 46 sed '/^#/d;s/\([{}@]\)/@\1/g' $< > $@
47 47
48AM_MAKEINFOFLAGS = @IMPRIMATUR_MAKEINFOFLAGS@ -I$(top_srcdir)/@GRECS_SUBDIR@/doc 48AM_MAKEINFOFLAGS = @IMPRIMATUR_MAKEINFOFLAGS@ -I $(top_srcdir)/@GRECS_SUBDIR@/doc
49imprimatur_INPUT=$(info_TEXINFOS) $(cfpeek_TEXINFOS) 49imprimatur_INPUT=$(info_TEXINFOS) $(cfpeek_TEXINFOS)
50include ../imprimatur/imprimatur.mk 50include ../imprimatur/imprimatur.mk
51CHECK_DOCS=$(top_srcdir)/@IMPRIMATUR_MODULE_DIR@/check-docs.sh 51CHECK_DOCS=$(top_srcdir)/@IMPRIMATUR_MODULE_DIR@/check-docs.sh
52 52
53GENDOCS=$(srcdir)/gendocs.sh 53GENDOCS=$(srcdir)/gendocs.sh --no-copy-images --html '--init-file=$(abs_srcdir)/html.init'
54EXTRA_DIST += gendocs.sh 54EXTRA_DIST += gendocs.sh
55 55
56TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E 56TEXI2DVI=texi2dvi -t '@set $(RENDITION)'
57 57
58# Make sure you set TEXINPUTS. 58# Make sure you set TEXINPUTS.
59# TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions 59# TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions
@@ -61,8 +61,8 @@ TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
61manual: 61manual:
62 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \ 62 TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
63 MAKEINFO="$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)" \ 63 MAKEINFO="$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)" \
64 TEXI2DVI="$(TEXI2DVI) -t @finalout" \ 64 TEXI2DVI="$(TEXI2DVI) -E" \
65 $(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual' 65 $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'
66 66
67# Checking 67# Checking
68check-options: 68check-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);
78set_from_init_file('DEFAULT_RULE', ''); 78set_from_init_file('DEFAULT_RULE', '');
79set_from_init_file('BIG_RULE', ''); 79set_from_init_file('BIG_RULE', '');
80 80
81# Turn off footer buttons in section split 81# Turn off navigation bars at the bottom of each section in chapter split mode,
82set_from_init_file('SECTION_FOOTER_BUTTONS', undef); 82# or subsection in section split mode.
83#set_from_init_file('SECTION_BUTTONS', undef);
84# Turn off navigation bars at the bottom of each section in chapter split mode
85set_from_init_file('HEADERS', undef) 83set_from_init_file('HEADERS', undef)
86 if (get_conf('SPLIT') and (get_conf('SPLIT') eq 'chapter')); 84 if ((get_conf('SPLIT') eq 'chapter') or (get_conf('SPLIT') eq 'section'));
87# Use navigation icons 85# Use navigation icons
88 86
89set_from_init_file('ICONS', 1); 87set_from_init_file('ICONS', 1);
@@ -152,9 +150,11 @@ my @gray_buttons = (\&gray_document_title, ' ',
152 'FastBack', ' ', 'Up', ' ', 'FastForward', ' ', 150 'FastBack', ' ', 'Up', ' ', 'FastForward', ' ',
153 'Contents', 'Index' ); 151 'Contents', 'Index' );
154 152
153set_from_init_file('TOP_BUTTONS', undef);
155set_from_init_file('SECTION_BUTTONS', \@gray_buttons); 154set_from_init_file('SECTION_BUTTONS', \@gray_buttons);
156set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons); 155set_from_init_file('CHAPTER_BUTTONS', \@gray_buttons);
157set_from_init_file('NODE_FOOTER_BUTTONS', \@gray_buttons); 156set_from_init_file('NODE_FOOTER_BUTTONS', \@gray_buttons);
157set_from_init_file('SECTION_FOOTER_BUTTONS', \@gray_buttons);
158set_from_init_file('MISC_BUTTONS', 158set_from_init_file('MISC_BUTTONS',
159 [\&gray_document_title, 159 [\&gray_document_title,
160 'Contents', 160 '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 @@
1# This file is part of cfpeek 1# This file is part of cfpeek
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011,2015 Sergey Poznyakoff
3# 3#
4# Cfpeek is free software; you can redistribute it and/or modify 4# Cfpeek is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -28,8 +28,8 @@ cfpeek_SOURCES = \
28 script.c 28 script.c
29 29
30LDADD=@GRECS_LDADD@ @GUILE_LIBS@ 30LDADD=@GRECS_LDADD@ @GUILE_LIBS@
31INCLUDES = -I$(top_srcdir) @GRECS_INCLUDES@ @GUILE_INCLUDES@
32AM_CPPFLAGS= \ 31AM_CPPFLAGS= \
32 -I$(top_srcdir) @GRECS_INCLUDES@ @GUILE_INCLUDES@\
33 -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)" 33 -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)"
34 34
35BUILT_SOURCES = cmdline.h 35BUILT_SOURCES = cmdline.h

Return to:

Send suggestions and report system problems to the System administrator.