diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/mkmf.rb | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun May 5 06:53:45 2002 Akinori MUSHA <knu@iDaemons.org> + + * lib/mkmf.rb: exclude topdir from the system configuration + section and prevent it from being overridden. + Fri May 3 20:19:00 2002 WATANABE Hirofumi <eban@ruby-lang.org> * configure.in: add #include <errno.h> in AC_CHECK_DECLS(). diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 25fb9cbef5..3491662028 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -499,12 +499,12 @@ EOMF if destdir = CONFIG["prefix"].scan(drive)[0] and !destdir.empty? mfile.print "\nDESTDIR = ", destdir, "\n" end - CONFIG.select do |key, var| - next if /prefix$/ !~ key + CONFIG.each do |key, var| + next unless /prefix$/ =~ key mfile.print key, " = ", with_destdir(var.sub(drive, '')), "\n" end - CONFIG.select do |key, var| - next if key == "srcdir" or /dir$/ !~ key + CONFIG.each do |key, var| + next unless /^(?:src|top|(.*))dir$/ =~ key and $1 mfile.print key, " = ", with_destdir(var.sub(drive, '')), "\n" end mfile.print <<EOMF |