diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-24 10:29:17 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-07-24 10:29:17 +0000 |
| commit | e54216b7409d9e4d7d56f089703ea0d79f57ea1c (patch) | |
| tree | 98dfc31e975c441748697987d24e82acd1271c47 | |
| parent | ea82a51a15f25293812c2641cbe620b0ec998ab6 (diff) | |
* ext/extmk.rb.in, lib/mkmf.rb: dig the target subdirectory for
lib/* files properly in case of create_makefile("dir/name").
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb.in | 7 | ||||
| -rw-r--r-- | lib/mkmf.rb | 7 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Jul 24 19:23:15 2001 Akinori MUSHA <knu@iDaemons.org> + + * ext/extmk.rb.in, lib/mkmf.rb: dig the target subdirectory for + lib/* files properly in case of create_makefile("dir/name"). + Mon Jul 23 00:26:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (rb_provide_feature): should not tweak extension used for diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index cb503bdcdd..b97902e3fc 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -173,8 +173,11 @@ def install_rb(mfile, srcdir = nil) end end for f in dir - next if f == "." - mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f + if f == "." + mfile.print "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)$(target_prefix)\n" + else + mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f + end end for f in path mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f, f diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 4c375a8845..93a548fc33 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -154,8 +154,11 @@ def install_rb(mfile, dest, srcdir = nil) end end for f in dir - next if f == "." - mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' %s/%s\n", dest, f + if f == "." + mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' %s\n", dest + else + mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' %s/%s\n", dest, f + end end for f in path d = '/' + File::dirname(f) |