SOURCES: ruby-wxruby2-DESTDIR.patch (NEW) - allow to pass DESTDIR ...

twittner twittner at pld-linux.org
Sun Dec 18 22:03:33 CET 2005


Author: twittner                     Date: Sun Dec 18 21:03:33 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- allow to pass DESTDIR to `rake install'

---- Files affected:
SOURCES:
   ruby-wxruby2-DESTDIR.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/ruby-wxruby2-DESTDIR.patch
diff -u /dev/null SOURCES/ruby-wxruby2-DESTDIR.patch:1.1
--- /dev/null	Sun Dec 18 22:03:33 2005
+++ SOURCES/ruby-wxruby2-DESTDIR.patch	Sun Dec 18 22:03:28 2005
@@ -0,0 +1,48 @@
+--- wxruby2/rakefile~	2005-12-18 18:00:42.882907248 +0100
++++ wxruby2/rakefile	2005-12-18 20:35:03.496201640 +0100
+@@ -41,10 +41,11 @@
+ $dl_lib = "wxruby2.#{$dl_ext}"
+ 
+ #used for :install
+-$ruby = "#{Config::CONFIG['bindir']}/#{Config::CONFIG['ruby_install_name']}"
++$destdir = "#{ENV['DESTDIR']}"
++$ruby = "#{Config::CONFIG['bindir']}/#{Config::CONFIG['ruby_install_name']}"
+ $install_prog = "#$ruby -run -e install -- -vpm 0755"
+ $install_site_dir = "#{Config::CONFIG['sitedir']}/#{Config::CONFIG['MAJOR']}.#{Config::CONFIG['MINOR']}"
+-$install_lib_dir = "#$install_site_dir/#{Config::CONFIG['sitearch']}"
++$install_lib_dir = $destdir + "#$install_site_dir/#{Config::CONFIG['sitearch']}"
+ 
+ #############################
+ # later, support static linking
+--- wxruby2/rake/rakeutil.rb~	2005-12-18 20:12:29.743003408 +0100
++++ wxruby2/rake/rakeutil.rb	2005-12-18 20:36:05.572764568 +0100
+@@ -7,6 +7,7 @@
+ # in the standard rake program
+ 
+ require "rbconfig"
++require "fileutils"
+ 
+ $extmk = /extmk\.rb/ =~ $0
+ $mswin = /mswin/ =~ RUBY_PLATFORM
+@@ -24,6 +25,10 @@
+     end
+ end
+ 
++def force_mkdir_p(dir)
++	FileUtils.mkdir_p(dir)
++end
++
+ def force_rmdir(dir)
+ 	if(dir != '.' && dir != '..' && File.directory?(dir))
+         rmdir(dir)
+--- wxruby2/rake/rakewx.rb~	2005-12-18 20:00:11.334776152 +0100
++++ wxruby2/rake/rakewx.rb	2005-12-18 20:38:08.406091064 +0100
+@@ -245,7 +245,7 @@
+ 
+ def install_lib(filename)
+ 	if(!File.directory?($install_lib_dir))
+-		mkdir($install_lib_dir)
++		force_mkdir_p($install_lib_dir)
+ 	end
+ 	sh "#{$install_prog} lib/#{filename} #{$install_lib_dir}"
+ end
================================================================



More information about the pld-cvs-commit mailing list