summaryrefslogtreecommitdiffstats
path: root/install.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-13 23:07:18 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-13 23:07:18 +0000
commit7ed556083fa1b8ed8230c86b52a78430abb2ff19 (patch)
tree427573c3ffe45aae1875f8927ad8f01b869c0b74 /install.rb
parentfd8e080768a3a4e048e8638b60c74afd9d798e98 (diff)
downloadpuppet-7ed556083fa1b8ed8230c86b52a78430abb2ff19.tar.gz
puppet-7ed556083fa1b8ed8230c86b52a78430abb2ff19.tar.xz
puppet-7ed556083fa1b8ed8230c86b52a78430abb2ff19.zip
Fixing installer; it somehow got broken with recent DESTDIR fixes
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1266 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'install.rb')
-rw-r--r--install.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/install.rb b/install.rb
index dbb9a3c98..25e3a2f56 100644
--- a/install.rb
+++ b/install.rb
@@ -167,6 +167,7 @@ def prepare_installation
FileUtils.makedirs(bd)
FileUtils.makedirs(sd)
else
+ bd = Config::CONFIG['bindir']
bds << Config::CONFIG['bindir']
end
@@ -278,6 +279,7 @@ def install_binfile(from, op_file, target)
installed_wrapper = true
end
end
+ p target
FileUtils.install(tmp_file, File.join(target, op_file), :mode => 0755, :verbose => true)
File.unlink(tmp_file)
end