diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-05-25 21:54:49 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-05-25 21:54:49 +0000 |
commit | 98ad43a19e71c2a100c4e025027e71abe44729e6 (patch) | |
tree | 5a6409c3186744c8eef98bcef1feb0beb3ee5087 | |
parent | 4cd30194f18cdb792bc551080b95c0a6ce400de5 (diff) | |
download | puppet-98ad43a19e71c2a100c4e025027e71abe44729e6.tar.gz puppet-98ad43a19e71c2a100c4e025027e71abe44729e6.tar.xz puppet-98ad43a19e71c2a100c4e025027e71abe44729e6.zip |
fixing destdir in installer, and adding solaris conf stuff
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1225 980ebf18-57e1-0310-9a29-db15c13687c0
-rw-r--r-- | conf/solaris/pkginfo | 7 | ||||
-rw-r--r-- | install.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/conf/solaris/pkginfo b/conf/solaris/pkginfo new file mode 100644 index 000000000..c9668401a --- /dev/null +++ b/conf/solaris/pkginfo @@ -0,0 +1,7 @@ +PKG=CSWpuppet +NAME=puppet - System Automation Framework +VERSION=0.17.2 +CATEGORY=application +VENDOR=http://reductivelabs.com/projects/puppet +HOTLINE=http://reductivelabs.com/cgi-bin/puppet.cgi +EMAIL=luke@madstop.com diff --git a/install.rb b/install.rb index 327bd6168..dbb9a3c98 100644 --- a/install.rb +++ b/install.rb @@ -299,5 +299,5 @@ prepare_installation run_tests(tests) if InstallOptions.tests #build_rdoc(rdoc) if InstallOptions.rdoc #build_ri(ri) if InstallOptions.ri -do_bins(bins, Config::CONFIG['bindir']) +do_bins(bins, InstallOptions.bin_dir) do_libs(libs) |