diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-08 12:11:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-08 12:11:32 +0200 |
| commit | 8ce3104e0e290b603599ec2e1b86bb82497c2665 (patch) | |
| tree | 9b099435ac4d3aa05439be277a32e19337c07c7a /Makefile.am | |
| parent | 3409bc0188feb4b00cdd5ec7acc357faa6cad698 (diff) | |
| parent | 6bf25b7b0554e8b569bc4938c4833491aedc742f (diff) | |
| download | patches-8ce3104e0e290b603599ec2e1b86bb82497c2665.tar patches-8ce3104e0e290b603599ec2e1b86bb82497c2665.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am index 6eb4c0fb9c..bf9c1d0e91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,6 +61,7 @@ MODULES = \ guix/build/cmake-build-system.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ + guix/build/linux-initrd.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ guix/build/utils.scm \ @@ -187,32 +188,7 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA SUBDIRS = po -info_TEXINFOS = doc/guix.texi -EXTRA_DIST += \ - doc/fdl-1.3.texi \ - doc/images/bootstrap-graph.dot \ - doc/images/bootstrap-graph.eps - -infoimagedir = $(infodir)/images -dist_infoimage_DATA = doc/images/bootstrap-graph.png - -# Try hard to obtain an image size and aspect that's reasonable for inclusion -# in an Info or PDF document. -DOT_OPTIONS = \ - -Tpng -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \ - -Nfontsize=9 -Nheight=.1 -Nwidth=.1 - -.dot.png: - dot -Tpng $(DOT_OPTIONS) < "$<" > "$@.tmp" - mv "$@.tmp" "$@" - -.dot.eps: - dot -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp" - mv "$@.tmp" "$@" - -doc/guix.pdf: doc/images/bootstrap-graph.png -doc/guix.info: doc/images/bootstrap-graph.png -doc/guix.ps: doc/images/bootstrap-graph.eps +include doc.am if BUILD_DAEMON |