diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-20 16:23:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-20 16:23:27 +0000 |
| commit | 795ccc4b834bb4656e037eda709d0b4e4b55f425 (patch) | |
| tree | 3c9e80c6976b44b725002cf5c928780adab5d72a /lib | |
| parent | 5e37b9d3478111088d3f4c5b6444c1993119327b (diff) | |
* lib/mkmf.rb (with_destdir): new.
* 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/branches/ruby_1_6@1928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6238e48d05..5b1c7e7718 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -360,6 +360,10 @@ def dir_config(target, idefault=nil, ldefault=nil) [idir, ldir] end +def with_destdir(dir) + /^\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir +end + def create_makefile(target, srcdir = File.dirname($0)) save_libs = $libs.dup save_libpath = $LIBPATH.dup @@ -451,14 +455,14 @@ else "" end } -prefix = $(DESTDIR)#{CONFIG["prefix"].sub(drive, '')} -exec_prefix = #{CONFIG["exec_prefix"].sub(drive, '')} -libdir = #{$libdir.sub(drive, '')} -rubylibdir = #{$rubylibdir.sub(drive, '')} -archdir = #{$archdir.sub(drive, '')} -sitedir = #{$sitedir.sub(drive, '')} -sitelibdir = #{$sitelibdir.sub(drive, '')} -sitearchdir = #{$sitearchdir.sub(drive, '')} +prefix = #{with_destdir CONFIG["prefix"].sub(drive, '')} +exec_prefix = #{with_destdir CONFIG["exec_prefix"].sub(drive, '')} +libdir = #{with_destdir $libdir.sub(drive, '')} +rubylibdir = #{with_destdir $rubylibdir.sub(drive, '')} +archdir = #{with_destdir $archdir.sub(drive, '')} +sitedir = #{with_destdir $sitedir.sub(drive, '')} +sitelibdir = #{with_destdir $sitelibdir.sub(drive, '')} +sitearchdir = #{with_destdir $sitearchdir.sub(drive, '')} target_prefix = #{target_prefix} #### End of system configuration section. #### @@ -499,7 +503,7 @@ EOMF mfile.printf <<EOMF $(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) EOMF install_rb(mfile, "$(sitelibdir)$(target_prefix)", srcdir) |