diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-05-15 12:17:57 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-05-15 12:17:57 +0300 |
| commit | 6ed15cc122e4f1f6281952a7b484ea038c73f816 (patch) | |
| tree | 4061794595be3b1838bca38129f43080e922047e /doc/Makefile.am | |
| parent | 448b11b3f51873392e916eec9dbe1dd11a96c72b (diff) | |
| download | cfpeek-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 (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 10 |
1 files changed, 5 insertions, 5 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: |