diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-09-08 09:42:09 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-09-08 09:42:09 +0000 |
commit | 4fad1f8a239f6c39d4c4270d0f36e3f5c946a533 (patch) | |
tree | 376bdecaf21383c0ae928897abea74f8503c370e | |
parent | 626a9362a6831acce530ec302a5b6dd98fbb3be8 (diff) |
1.1c5 - mkmf/extmk
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ext/extmk.rb.in | 9 | ||||
-rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index e0f16e116c..e0e4569870 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -1,6 +1,7 @@ #! /usr/local/bin/ruby $".push 'mkmf.rb' #" +require 'find' if ARGV[0] == 'static' $force_static = TRUE @@ -107,7 +108,7 @@ def install_rb(mfile) 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 + mfile.printf "\t$(INSTALL_DATA) lib/%s $(libdir)/%s\n", f, f end end @@ -281,7 +282,8 @@ RUBY_INSTALL_NAME = `t='$(program_transform_name)'; echo ruby | sed $$t` prefix = @prefix@ exec_prefix = @exec_prefix@ -libdir = @libdir@/$(RUBY_INSTALL_NAME)/@arch@ +libdir = @libdir@/$(RUBY_INSTALL_NAME) +archdir = $(libdir)/@arch@ @SET_MAKE@ #### End of system configuration section. #### @@ -323,10 +325,11 @@ realclean: clean install: @test -d $(libdir) || mkdir $(libdir) + @test -d $(archdir) || mkdir $(archdir) " if !$static mfile.printf "\ - $(INSTALL) $(TARGET) $(libdir)/$(TARGET) + $(INSTALL) $(TARGET) $(archdir)/$(TARGET) " end install_rb(mfile) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 21476cbd33..0aa9d98b9c 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -98,7 +98,7 @@ def install_rb(mfile) 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 + mfile.printf "\t$(INSTALL_DATA) lib/%s $(libdir)/%s\n", f, f end end |