about summary refs log tree commit diff
path: root/doc/manual/Makefile.am
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-11T22·53-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-11T22·53-0400
commit04559a0d45ad02fc760b09132cca0d875af035e5 (patch)
treed7de1301fa9753467781dfc5d931959fcfae34bf /doc/manual/Makefile.am
parente4d6bcb6cdc34d204ccf49e137dd5070f664c523 (diff)
parenteae802459d7639a69baec555264f394adad043c0 (diff)
Merge branch 'master' of github.com:NixOS/nix into no-manifests
Diffstat (limited to 'doc/manual/Makefile.am')
-rw-r--r--doc/manual/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index 33cb27e054bd..42da3c8b0c09 100644
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -21,6 +21,8 @@ man1_MANS = nix-env.1 nix-build.1 nix-store.1 nix-instantiate.1 \
  nix-prefetch-url.1 nix-channel.1 \
  nix-install-package.1 nix-hash.1 nix-copy-closure.1
 
+man5_MANS = nix.conf.5
+
 man8_MANS = nix-worker.8
 
 FIGURES = figures/user-environments.png