summaryrefslogtreecommitdiff
path: root/doc.am
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-06-18 01:32:37 -0400
committerMark H Weaver <mhw@netris.org>2015-06-18 01:32:37 -0400
commit2abf678682c42842c16e026c51d96b1fa86be88f (patch)
tree7bd59bd08dbaf00f23f37a91d1e7ae3d7a915843 /doc.am
parent9ae1e920718e95577c12de890754b6a6a4ff70a1 (diff)
parentc362a40a5825faafc76b72f69fb6595fa29d3f60 (diff)
downloadguix-patches-2abf678682c42842c16e026c51d96b1fa86be88f.tar
guix-patches-2abf678682c42842c16e026c51d96b1fa86be88f.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'doc.am')
-rw-r--r--doc.am10
1 files changed, 9 insertions, 1 deletions
diff --git a/doc.am b/doc.am
index de232a87a4..ee896c189b 100644
--- a/doc.am
+++ b/doc.am
@@ -90,6 +90,7 @@ SUBCOMMANDS := \
archive \
build \
download \
+ edit \
environment \
gc \
hash \
@@ -99,6 +100,7 @@ SUBCOMMANDS := \
publish \
pull \
refresh \
+ size \
system
$(eval $(foreach subcommand,$(SUBCOMMANDS), \
@@ -106,5 +108,11 @@ $(eval $(foreach subcommand,$(SUBCOMMANDS), \
dist_man1_MANS = \
doc/guix.1 \
- doc/guix-daemon.1 \
$(SUBCOMMANDS:%=doc/guix-%.1)
+
+if BUILD_DAEMON
+
+dist_man1_MANS += \
+ doc/guix-daemon.1
+
+endif