1.1c5

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 20 insertions, 4 deletions

diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 0c32954577..e0f16e116c 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -93,6 +93,24 @@ def try_cpp
   xsystem(format(CPP, $CFLAGS))
 end
 
+def install_rb(mfile)
+  path = []
+  dir = []
+  Find.find("lib") do |f|
+    next unless /\.rb$/ =~ f
+    f = f[4..-1]
+    path.push f
+    dir |= File.dirname(f)
+  end
+  for f in dir
+    next if f == "."
+    mfile.printf "\t@test -d $(libdir)/%s || mkdir $(libdir)/%s\n", f, f
+  end
+  for f in path
+    mfile.printf "\t$(INSTALL_DATA) %s $(libdir)/%s\n", f, f
+  end
+end
+
 def have_library(lib, func)
   if $lib_cache[lib]
     if $lib_cache[lib] == "yes"
@@ -304,16 +322,14 @@ realclean:	clean
   mfile.printf "\
 
 install:
+	@test -d $(libdir) || mkdir $(libdir)
 "
   if !$static
     mfile.printf "\
-	@test -d $(libdir) || mkdir $(libdir)
 	$(INSTALL) $(TARGET) $(libdir)/$(TARGET)
 "
   end
-  for rb in Dir["lib/*.rb"]
-    mfile.printf "\t$(INSTALL_DATA) %s @libdir@/$(RUBY_INSTALL_NAME)\n", rb
-  end
+  install_rb(mfile)
   mfile.printf "\n"
 
   if !$static && "@DLEXT@" != "o"