diff options
| author | Andy Wingo <wingo@pobox.com> | 2008-09-30 21:12:16 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2008-09-30 21:12:16 +0200 |
| commit | 999f1b26e74a7a8eb9e9e5e479f971e145aa7326 (patch) | |
| tree | 5f80e3cdf6f70d5fae969d5350d17111365efc41 /doc/Makefile.am | |
| parent | ac0e91c42dac01b74f89260090273cdb7ff7e791 (diff) | |
| parent | 89bc270db3c207b2210736f066ce18721e0dbc76 (diff) | |
| download | guile-999f1b26e74a7a8eb9e9e5e479f971e145aa7326.tar.gz | |
Merge commit 'origin/master' into vm
Conflicts:
doc/Makefile.am
ice-9/Makefile.am
libguile/gc.c
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 8543b0589..331a46815 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -27,7 +27,7 @@ SUBDIRS = ref tutorial goops r5rs # man_MANS = guile.1 EXAMPLE_SMOB_FILES = \ - ChangeLog Makefile README image-type.c image-type.h myguile.c + ChangeLog-2008 Makefile README image-type.c image-type.h myguile.c OLDFMT = oldfmt.c @@ -38,16 +38,14 @@ dist-hook: cp $(srcdir)/example-smob/$$f $(distdir)/example-smob/; \ done -EXTRA_DIST = groupings.alist # guile-api.alist +EXTRA_DIST = groupings.alist ChangeLog-2008 # guile-api.alist # pending the papers from Robert Merkel # EXTRA_DIST = guile.1 -if MAINTAINER_MODE include $(top_srcdir)/am/maintainer-dirs guile-api.alist: guile-api.alist-FORCE ( cd $(top_builddir) ; $(mscripts)/update-guile-api.alist ) guile-api.alist-FORCE: -endif info_TEXINFOS = guile-vm.texi |