summaryrefslogtreecommitdiff
path: root/doc.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-09 23:51:46 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-09 23:53:36 +0200
commitdd51caac55f052cecc61c7b8ab16654e3ace569f (patch)
treeb800ae3a39682c12cc4b68ae6cf3e3f69e839329 /doc.am
parente1fbc32a0a1d027ec641ac0e249ad9aa1d5a8ffa (diff)
downloadpatches-dd51caac55f052cecc61c7b8ab16654e3ace569f.tar
patches-dd51caac55f052cecc61c7b8ab16654e3ace569f.tar.gz
doc: Show both the "bare-bones" and the "desktop" configurations.
* doc/guix.texi (System Installation): Add xref to "Using the Configuration System" instead of including one here. (Using the Configuration System): Remove first example, and include os-config-bare-bones.texi instead. Include os-config-desktop.texi as a second example. * doc.am (OS_CONFIG_EXAMPLES_TEXI): New variable. (BUILT_SOURCES, EXTRA_DIST, MAINTAINERCLEANFILES): Use it. (doc/os-config.texi): Remove. (doc/os-config-%.texi): New target.
Diffstat (limited to 'doc.am')
-rw-r--r--doc.am12
1 files changed, 8 insertions, 4 deletions
diff --git a/doc.am b/doc.am
index c517e0f908..df85cfe2b0 100644
--- a/doc.am
+++ b/doc.am
@@ -25,12 +25,16 @@ EXTRA_DIST += \
doc/images/bootstrap-graph.eps \
doc/images/bootstrap-graph.pdf
+OS_CONFIG_EXAMPLES_TEXI = \
+ doc/os-config-bare-bones.texi \
+ doc/os-config-desktop.texi
+
# 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
+BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI)
+EXTRA_DIST += $(OS_CONFIG_EXAMPLES_TEXI)
+MAINTAINERCLEANFILES = $(OS_CONFIG_EXAMPLES_TEXI)
-doc/os-config.texi: gnu/system/examples/bare-bones.tmpl
+doc/os-config-%.texi: gnu/system/examples/%.tmpl
$(MKDIR_P) "`dirname "$@"`"
cp "$<" "$@"