diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-17 10:34:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-17 10:34:31 +0000 |
| commit | bab1372a33543eaf89b265197866cac3466e78da (patch) | |
| tree | 9962347172d4dda4dde651d5a78c019b6f5383ab /lib | |
| parent | 919fc002ebaa2256d76ec25908918a8412a06ab1 (diff) | |
| download | ruby-bab1372a33543eaf89b265197866cac3466e78da.tar.gz | |
* ext/extmk.rb (extmake): $extout_prefix doesn't vary for libraries.
* ext/extmk.rb (extmake): remove compile directory if empty.
* ext/extmk.rb (parse_args) lib/mkmf.rb (create_makefile): move
initialization of $extout_prefix from lib/mkmf.rb. [ruby-dev:22928]
* ext/extmk.rb: clear ext and extout directory when cleaning.
* lib/mkmf.rb (CLEANLIBS): should be under $(arch) directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 189c496128..6f6592b5df 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -819,8 +819,6 @@ def create_makefile(target, srcprefix = nil) target_prefix = "" end - $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : "" - srcprefix ||= '$(srcdir)' Config::expand(srcdir = srcprefix.dup) @@ -898,7 +896,7 @@ RUBYARCHDIR = $(sitearchdir)$(target_prefix) } end mfile.print %{ -CLEANLIBS = #{$extout_prefix}$(TARGET).{#{CONFIG['DLEXT']},#{$LIBEXT},exp,il?,tds,map} +CLEANLIBS = #{$extout ? '$(RUBYARCHDIR)/' : ''}$(TARGET).{#{CONFIG['DLEXT']},exp,il?,tds,map} CLEANOBJS = *.#{$OBJEXT} *.#{$LIBEXT} *.s[ol] *.pdb *.bak all: #{target ? $extout ? "install" : "$(DLLIB)" : "Makefile"} @@ -1025,6 +1023,7 @@ def init_mkmf(config = CONFIG) $distcleanfiles = [] $extout ||= nil + $extout_prefix ||= nil dir_config("opt") end |