1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (with_destdir): new.

Browse Source 
* lib/mkmf.rb: prefix target directories with $(DESTDIR) all.

* lib/mkmf.rb: no need to mkdir $(libdir)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2001-12-20 16:23:27 +00:00
parent 5a4187f2c2
commit b7a58b0650
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Dec 21 01:17:57 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* lib/mkmf.rb (with_destdir): new.
* lib/mkmf.rb: prefix target directories with $(DESTDIR) all.
* lib/mkmf.rb: no need to mkdir $(libdir)
Thu Dec 20 14:08:20 2001 Minero Aoki <aamine@loveruby.net> Thu Dec 20 14:08:20 2001 Minero Aoki <aamine@loveruby.net>
* lib/net/protocol.rb: rename Net::Socket to Net::BufferedSocket * lib/net/protocol.rb: rename Net::Socket to Net::BufferedSocket

22
lib/mkmf.rb
View File

@ -364,6 +364,10 @@ def dir_config(target, idefault=nil, ldefault=nil)
[idir, ldir] [idir, ldir]
end end
def with_destdir(dir)
/^\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
end
def create_makefile(target, srcdir = File.dirname($0)) def create_makefile(target, srcdir = File.dirname($0))
save_libs = $libs.dup save_libs = $libs.dup
save_libpath = $LIBPATH.dup save_libpath = $LIBPATH.dup
@ -455,14 +459,14 @@ else
"" ""
end end
} }
prefix = $(DESTDIR)#{CONFIG["prefix"].sub(drive, '')} prefix = #{with_destdir CONFIG["prefix"].sub(drive, '')}
exec_prefix = #{CONFIG["exec_prefix"].sub(drive, '')} exec_prefix = #{with_destdir CONFIG["exec_prefix"].sub(drive, '')}
libdir = #{$libdir.sub(drive, '')} libdir = #{with_destdir $libdir.sub(drive, '')}
rubylibdir = #{$rubylibdir.sub(drive, '')} rubylibdir = #{with_destdir $rubylibdir.sub(drive, '')}
archdir = #{$archdir.sub(drive, '')} archdir = #{with_destdir $archdir.sub(drive, '')}
sitedir = #{$sitedir.sub(drive, '')} sitedir = #{with_destdir $sitedir.sub(drive, '')}
sitelibdir = #{$sitelibdir.sub(drive, '')} sitelibdir = #{with_destdir $sitelibdir.sub(drive, '')}
sitearchdir = #{$sitearchdir.sub(drive, '')} sitearchdir = #{with_destdir $sitearchdir.sub(drive, '')}
target_prefix = #{target_prefix} target_prefix = #{target_prefix}
#### End of system configuration section. #### #### End of system configuration section. ####
@ -503,7 +507,7 @@ EOMF
mfile.printf <<EOMF mfile.printf <<EOMF
$(sitearchdir)$(target_prefix)/$(DLLIB): $(DLLIB) $(sitearchdir)$(target_prefix)/$(DLLIB): $(DLLIB)
@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(libdir) $(sitearchdir)$(target_prefix) @$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(sitearchdir)$(target_prefix)
@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(sitearchdir)$(target_prefix)/$(DLLIB) @$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(sitearchdir)$(target_prefix)/$(DLLIB)
EOMF EOMF
install_rb(mfile, "$(sitelibdir)$(target_prefix)", srcdir) install_rb(mfile, "$(sitelibdir)$(target_prefix)", srcdir)

4
version.h
View File

@ -1,4 +1,4 @@
#define RUBY_VERSION "1.7.2" #define RUBY_VERSION "1.7.2"
#define RUBY_RELEASE_DATE "2001-12-19" #define RUBY_RELEASE_DATE "2001-12-20"
#define RUBY_VERSION_CODE 172 #define RUBY_VERSION_CODE 172
#define RUBY_RELEASE_CODE 20011219 #define RUBY_RELEASE_CODE 20011220