diff options
| author | Andy Wingo <wingo@pobox.com> | 2009-01-12 21:36:39 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2009-01-12 21:36:39 +0100 |
| commit | c32929d14d40f9e00c3fd10d3f51d54733ebf687 (patch) | |
| tree | c803163a177580b5a8506052a18664a48504ba00 /doc/Makefile.am | |
| parent | c41350777d6faf05f80627f97ca01cd5c8fac47b (diff) | |
| parent | dc686d7b0a1490e26482e018489dec040b79b952 (diff) | |
| download | guile-c32929d14d40f9e00c3fd10d3f51d54733ebf687.tar.gz | |
Merge commit 'origin/master' into vm
Conflicts:
.gitignore
guile-tools.in
srfi/srfi-19.scm
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 331a46815..f4e0718d6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -23,8 +23,7 @@ AUTOMAKE_OPTIONS = gnu SUBDIRS = ref tutorial goops r5rs -# pending the papers from Robert Merkel -# man_MANS = guile.1 +dist_man1_MANS = guile.1 EXAMPLE_SMOB_FILES = \ ChangeLog-2008 Makefile README image-type.c image-type.h myguile.c @@ -40,9 +39,6 @@ dist-hook: EXTRA_DIST = groupings.alist ChangeLog-2008 # guile-api.alist -# pending the papers from Robert Merkel -# EXTRA_DIST = guile.1 - include $(top_srcdir)/am/maintainer-dirs guile-api.alist: guile-api.alist-FORCE ( cd $(top_builddir) ; $(mscripts)/update-guile-api.alist ) |