From bc714fb4f510f2b6dbe3f16a48afb729b50cdf81 Mon Sep 17 00:00:00 2001 From: eban Date: Thu, 8 Feb 2001 13:23:48 +0000 Subject: [PATCH] lib/mkmf.rb (create_makefile): add srcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/mkmf.rb | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 040bcd8ed2..346b828ecb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 8 21:27:24 2001 WATANABE Hirofumi + + * lib/mkmf.rb (install_rb): fix handling of relative path. + + * lib/mkmf.rb (create_makefile): add srcdir. + Thu Feb 8 02:22:09 2001 Minero Aoki * lib/net/http.rb: join HTTPReadResponse into HTTPResponse again. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8f614cf6c3..0f04794162 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -155,7 +155,7 @@ def install_rb(mfile, dest, srcdir = nil) mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' %s/%s\n", dest, f end for f in path - mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' lib/%s %s/%s\n", f, dest, f + mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' %s/%s %s\n", libdir, f, dest end end @@ -473,7 +473,7 @@ $(archdir)/$(DLLIB): $(DLLIB) @$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(libdir) $(archdir) @$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(archdir)/$(DLLIB) EOMF - install_rb(mfile, "$(libdir)") + install_rb(mfile, "$(libdir)", srcdir) mfile.printf "\n" mfile.printf <