aboutsummaryrefslogtreecommitdiff
path: root/doc.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-07-27 20:15:50 -0400
committerMark H Weaver <mhw@netris.org>2014-07-27 20:15:50 -0400
commit33690ffde5af2c516bc6b2dd060ab9cf7ab88eb2 (patch)
treed91daca5084dec6ede304d2c9ff1c376a740e416 /doc.am
parent5c47b06b4370e7d6590b0c75404d694a52897293 (diff)
parentb9663471a87916f36b50af2a0f885f6f08dc3ed2 (diff)
downloadpatches-33690ffde5af2c516bc6b2dd060ab9cf7ab88eb2.tar
patches-33690ffde5af2c516bc6b2dd060ab9cf7ab88eb2.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'doc.am')
-rw-r--r--doc.am11
1 files changed, 10 insertions, 1 deletions
diff --git a/doc.am b/doc.am
index 6cbc35a8cc..67cd739fae 100644
--- a/doc.am
+++ b/doc.am
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
#
# This file is part of GNU Guix.
@@ -24,6 +24,15 @@ EXTRA_DIST += \
doc/images/bootstrap-graph.eps \
doc/images/bootstrap-graph.pdf
+# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
+BUILT_SOURCES += doc/os-config.texi
+EXTRA_DIST += doc/os-config.texi
+MAINTAINERCLEANFILES = doc/os-config.texi
+
+doc/os-config.texi: gnu/system/os-config.tmpl
+ $(MKDIR_P) "`dirname "$@"`"
+ cp "$<" "$@"
+
infoimagedir = $(infodir)/images
dist_infoimage_DATA = doc/images/bootstrap-graph.png