From 98ad43a19e71c2a100c4e025027e71abe44729e6 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Thu, 25 May 2006 21:54:49 +0000
Subject: fixing destdir in installer, and adding solaris conf stuff

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1225 980ebf18-57e1-0310-9a29-db15c13687c0
---
 conf/solaris/pkginfo | 7 +++++++
 install.rb           | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 conf/solaris/pkginfo

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)
-- 
cgit