diff options
author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-12 13:36:54 -0700 |
---|---|---|
committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-12 13:36:54 -0700 |
commit | 2d13fdaac56bd5cd57444cc4447081649e18f487 (patch) | |
tree | 9dfe175ba879c96082996798fdedcab7988ed7c1 /install.rb | |
parent | e6c829617ccc120e04f945e8714f792ce29c284d (diff) | |
parent | 295c3be532b01a3ab58411b32b489730922d1c75 (diff) | |
download | puppet-2d13fdaac56bd5cd57444cc4447081649e18f487.tar.gz puppet-2d13fdaac56bd5cd57444cc4447081649e18f487.tar.xz puppet-2d13fdaac56bd5cd57444cc4447081649e18f487.zip |
Merge commit '2.6.2' into next
Diffstat (limited to 'install.rb')
-rwxr-xr-x | install.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/install.rb b/install.rb index 449223d26..f7541c854 100755 --- a/install.rb +++ b/install.rb @@ -462,4 +462,4 @@ prepare_installation do_bins(sbins, InstallOptions.sbin_dir) do_bins(bins, InstallOptions.bin_dir) do_libs(libs) -do_man(man) if InstallOptions.man +do_man(man) unless $operatingsystem == "windows" |