diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-24 16:04:36 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-24 16:04:36 -0500 |
| commit | 30f0fc0b1ce1900b6d94ec61ddb17fa1fdfdae5a (patch) | |
| tree | 657651c644c238d607f7f1a36563b359acef7e49 | |
| parent | 4bfc4efd969b01843137a6c51591435d05c19c5f (diff) | |
| parent | bd3f6ec87cfb6ccca976e3ab5d8cc13fd8c273a8 (diff) | |
| download | puppet-30f0fc0b1ce1900b6d94ec61ddb17fa1fdfdae5a.tar.gz puppet-30f0fc0b1ce1900b6d94ec61ddb17fa1fdfdae5a.tar.xz puppet-30f0fc0b1ce1900b6d94ec61ddb17fa1fdfdae5a.zip | |
Merge commit 'turnbull/0.24.x' into 0.24.x
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rwxr-xr-x | install.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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) |