diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-18 09:44:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-18 09:44:28 +0000 |
| commit | b31bca1b45fa65e8b4da102505871ca77aa1a45b (patch) | |
| tree | d3c1c5381a4f5b771343983c1f7bec567b069572 | |
| parent | c1c86a37df4afa6a4c9f9a55d8fe4a6667b4032d (diff) | |
* lib/mkmf.rb (init_mkmf): clear $INSTALLFILES. [ruby-dev:20727]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Fri Jul 18 18:44:22 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> + + * lib/mkmf.rb (init_mkmf): clear $INSTALLFILES. [ruby-dev:20727] + Fri Jul 18 17:34:39 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> * lib/mkmf.rb (rm_f): use FileUtils. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index debb1bfb65..f9e9a35533 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -92,8 +92,6 @@ CPPOUTFILE = CONFIG['CPPOUTFILE'] CONFTEST_C = "conftest.c" -$INSTALLFILES ||= nil - class String def quote /\s/ =~ self ? "\"#{self}\"" : self @@ -567,7 +565,7 @@ LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC CFLAGS = #{CONFIG['CCDLFLAGS'] unless $static} #$CFLAGS CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{$CPPFLAGS} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} -DLDFLAGS = #$LDFLAGS #{CONFIG['DLDFLAGS']} #$DLDFLAGS +DLDFLAGS = #{CONFIG['DLDFLAGS']} #$DLDFLAGS LDSHARED = #{CONFIG['LDSHARED']} AR = #{CONFIG['AR']} EXEEXT = #{CONFIG['EXEEXT']} @@ -798,6 +796,7 @@ def init_mkmf(config = CONFIG) $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"] $LIBPATH.unshift("$(topdir)") if $extmk + $INSTALLFILES = nil $objs = nil $libs = "" |