Ticket #27566: patch-install.rb.diff

install.rb

@@ -204 +204 @@
     opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default on.') do |ontest|
       InstallOptions.tests = ontest
     end
-    opts.on('--[no-]configs', 'Prevents the installation of config files', 'Default off.') do |ontest|
-      InstallOptions.configs = ontest
+    opts.on('--[no-]configs', 'Prevents the installation of config files', 'Default off.') do |onconfigs|
+      InstallOptions.configs = onconfigs
     end
     opts.on('--destdir[=OPTIONAL]', 'Installation prefix for all targets', 'Default essentially /') do |destdir|
       InstallOptions.destdir = destdir
@@ -300 +300 @@
     mandir = Config::CONFIG['mandir']
   end
 
-  # To be deprecated once people move over to using --destdir option
-  if (destdir = ENV['DESTDIR'])
-    configdir = "#{destdir}#{configdir}"
-    bindir = "#{destdir}#{bindir}"
-    sbindir = "#{destdir}#{sbindir}"
-    mandir = "#{destdir}#{mandir}"
-    sitelibdir = "#{destdir}#{sitelibdir}"
-
-    FileUtils.makedirs(configdir) if InstallOptions.configs
-    FileUtils.makedirs(bindir)
-    FileUtils.makedirs(sbindir)
-    FileUtils.makedirs(mandir)
-    FileUtils.makedirs(sitelibdir)
-  # This is the new way forward
-  elsif (destdir = InstallOptions.destdir)
+  if (destdir = InstallOptions.destdir)
     configdir = "#{destdir}#{configdir}"
     bindir = "#{destdir}#{bindir}"
     sbindir = "#{destdir}#{sbindir}"