summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2001-04-24 22:15:10 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2001-04-24 22:15:10 +0000
commitb516a720b9e21c30af7be0dc0f608ebd5a4d5f23 (patch)
treedb3b3473a10ddf8f65ef0576e7767e3f6157134e /doc
parent612943c6c1ea6a1b84604e6503cee99da1d6351f (diff)
downloadguile-b516a720b9e21c30af7be0dc0f608ebd5a4d5f23.tar.gz
* Fix bug with multiple files including of version.texi.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog8
-rw-r--r--doc/Makefile.am5
-rw-r--r--doc/guile-tut.texi2
3 files changed, 13 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index dbc517392..da006e011 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-24 Neil Jerram <neil@ossau.uklinux.net>
+
+ * guile-tut.texi: Include version-tutorial.texi rather than
+ version.texi.
+
+ * Makefile.am ($(srcdir)/version-tutorial.texi): New target, to
+ avoid having two files both include version.texi.
+
2001-04-24 Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
* Makefile.am (guile_TEXINFOS): Added srfi-13-14.texi.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 94375e3f0..5acbb145c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -67,6 +67,9 @@ dist-hook:
# This rule overrides automake's rule for version.texi. It causes
# version.texi to be created even in non-maintainer-mode.
-#
$(srcdir)/version.texi: stamp-vti
@:
+
+# And the same for version-tutorial.texi.
+$(srcdir)/version-tutorial.texi: stamp-vti1
+ @:
diff --git a/doc/guile-tut.texi b/doc/guile-tut.texi
index 20c73e68a..f2489cdaa 100644
--- a/doc/guile-tut.texi
+++ b/doc/guile-tut.texi
@@ -3,7 +3,7 @@
@setfilename guile-tut.info
@settitle Guile Tutorial
-@include version.texi
+@include version-tutorial.texi
@dircategory The Algorithmic Language Scheme
@direntry