From 3e7ebbbb08120243f7e982f34b8256ec58af67b0 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Wed, 2 Mar 2011 16:49:13 +1100
Subject: Fixed #6554 - Missing $haveftool if/else conditional in install.rb
 breaking Ruby 1.9

---
 install.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'install.rb')

diff --git a/install.rb b/install.rb
index 7627a8d11..2608e31da 100755
--- a/install.rb
+++ b/install.rb
@@ -92,8 +92,12 @@ def do_configs(configs, target, strip = 'conf/')
   Dir.mkdir(target) unless File.directory? target
   configs.each do |cf|
     ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, ''))
-    File.install(cf, ocf, 0644, true)
-  end
+    if $haveftools
+      File.install(cf, ocf, 0644, true)
+    else
+      FileUtils.install(cf, ocf, {:mode => 0644, :verbose => true})
+    end
+   end
 end
 
 def do_bins(bins, target, strip = 's?bin/')
-- 
cgit