aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c1226c340f..b78086cb4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 = ""