summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-01 05:04:04 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-11-01 05:04:04 +0000
commita39967d06218736fe8a6e366f1dfc6e1f2dfdb06 (patch)
tree1fcaac53c1b2c69da1b085a6fb34d66d95db9aaa
parentaa23bfaf08fb8eafa9c48fc0c3d79afc21ad3bf9 (diff)
* ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
* ext/enumerator/extconf.rb, ext/fcntl/extconf.rb, ext/stringio/extconf.rb: added. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/enumerator/extconf.rb2
-rw-r--r--ext/extmk.rb5
-rw-r--r--ext/fcntl/extconf.rb2
-rw-r--r--ext/stringio/extconf.rb2
5 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ee8311e169e..a3faf3abc60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 1 13:59:28 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
+
+ * ext/enumerator/extconf.rb, ext/fcntl/extconf.rb,
+ ext/stringio/extconf.rb: added.
+
Mon Nov 1 11:52:18 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* io.c (pipe_open): avoid conflict of variable name. [ruby-dev:24662]
diff --git a/ext/enumerator/extconf.rb b/ext/enumerator/extconf.rb
new file mode 100644
index 00000000000..94e2ee38b20
--- /dev/null
+++ b/ext/enumerator/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('enumerator')
diff --git a/ext/extmk.rb b/ext/extmk.rb
index c41354bf46e..16bb339f44f 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -77,7 +77,7 @@ def extmake(target)
unless $ignore
if !(t = modified?(makefile, MTIMES)) ||
%W<#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb
- #{$srcdir}/depend #{$srcdir}/MANIFEST>.any? {|f| modified?(f, [t])}
+ #{$srcdir}/depend>.any? {|f| modified?(f, [t])}
then
$defs = []
Logging::logfile 'mkmf.log'
@@ -313,8 +313,7 @@ end unless $extstatic
ext_prefix = "#{$top_srcdir}/ext"
exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
exts |= $extension if $extension
-exts.delete_if {|t| !File.exist?("#{ext_prefix}/#{t}/MANIFEST")}
-exts |= Dir.glob("#{ext_prefix}/*/**/MANIFEST").collect {|d|
+exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
d = File.dirname(d)
d.slice!(0, ext_prefix.length + 1)
d
diff --git a/ext/fcntl/extconf.rb b/ext/fcntl/extconf.rb
new file mode 100644
index 00000000000..8b717d4a5bb
--- /dev/null
+++ b/ext/fcntl/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('fcntl')
diff --git a/ext/stringio/extconf.rb b/ext/stringio/extconf.rb
new file mode 100644
index 00000000000..8fc84b37351
--- /dev/null
+++ b/ext/stringio/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('stringio')