summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG5
-rwxr-xr-xinstall.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 18058a414..0d3237328 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+ Ported #198 man page creation functionality to 0.24.x branch and
+ added man pages and man page creation logic to install.rb. The
+ man pages are stored in man/man8 and will install to config::CONFIG
+ mandir/man8.
+
Fixing #1138 -- the yamldir is automatically created by the
server now that it's in the :puppetmasterd section rather than
a separate :yaml section.
diff --git a/install.rb b/install.rb
index 576303f51..087c3c860 100755
--- a/install.rb
+++ b/install.rb
@@ -377,7 +377,7 @@ prepare_installation
run_tests(tests) if InstallOptions.tests
#build_rdoc(rdoc) if InstallOptions.rdoc
#build_ri(ri) if InstallOptions.ri
-build_man(bins) if InstallOptions.man
+#build_man(bins) if InstallOptions.man
do_bins(sbins, InstallOptions.sbin_dir)
do_bins(bins, InstallOptions.bin_dir)
do_libs(libs)