From 5dc9bf105a5cc1935c03334e6e05f6a254bb7b46 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 10 Jun 2007 07:55:49 +0000 Subject: * instruby.rb (ext-comm): make header directory first. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- instruby.rb | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba46389c72..2b466fc798 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,10 @@ -Sun Jun 10 16:36:22 2007 Nobuyoshi Nakada +Sun Jun 10 16:57:20 2007 Nobuyoshi Nakada * instruby.rb (install_recursive): add :glob option rather than using FNM_DOTMACH. + * instruby.rb (ext-comm): make header directory first. + Sun Jun 10 16:10:58 2007 NAKAMURA Usaku * test/ruby/test_beginendblock.rb: typo. diff --git a/instruby.rb b/instruby.rb index e910e15602..91ff79dfb4 100755 --- a/instruby.rb +++ b/instruby.rb @@ -184,7 +184,7 @@ arc = CONFIG["LIBRUBY_A"] install?(:local, :arch, :bin) do puts "installing binary commands" - makedirs [bindir, libdir, archlibdir, archhdrdir] + makedirs [bindir, libdir, archlibdir] install ruby_install_name+exeext, bindir, :mode => 0755 if rubyw_install_name and !rubyw_install_name.empty? @@ -213,7 +213,7 @@ if $extout extout = "#$extout" install?(:ext, :arch, :'ext-arch') do puts "installing extension objects" - makedirs [archlibdir, sitearchlibdir] + makedirs [archlibdir, sitearchlibdir, archhdrdir] if noinst = CONFIG["no_install_files"] and noinst.empty? noinst = nil end @@ -222,9 +222,10 @@ if $extout end install?(:ext, :comm, :'ext-comm') do puts "installing extension scripts" - makedirs [rubylibdir, sitelibdir] + hdrdir = rubyhdrdir + "/ruby" + makedirs [rubylibdir, sitelibdir, hdrdir] install_recursive("#{extout}/common", rubylibdir) - install_recursive("#{extout}/include/ruby", rubyhdrdir + "/ruby", :glob => "*.h") + install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h") end end -- cgit v1.2.3