diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-21 12:20:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-21 12:20:21 +0000 |
| commit | 3ef72aebef3ec06295bc3f14c2a09da91a44ff31 (patch) | |
| tree | d57605740ebf0b9840e5d8fc111eb909feb5a5a0 /lib | |
| parent | 33dd3c94bdd0bfa440b07f6f5a7eb7828b95aabe (diff) | |
| download | bundler-3ef72aebef3ec06295bc3f14c2a09da91a44ff31.tar.gz | |
* lib/mkmf.rb (create_makefile, install_files): honor srcprefix
argument if given. [ruby-dev:40449]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index fc9353e5cd..3b667a68bf 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -624,7 +624,7 @@ end def install_files(mfile, ifiles, map = nil, srcprefix = nil) ifiles or return ifiles.empty? and return - srcprefix ||= '$(srcdir)' + srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/') RbConfig::expand(srcdir = srcprefix.dup) dirs = [] path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]} @@ -1684,7 +1684,7 @@ def create_makefile(target, srcprefix = nil) target_prefix = "" end - srcprefix = "$(srcdir)/#{srcprefix}".chomp('/') + srcprefix ||= "$(srcdir)/#{srcprefix}".chomp('/') RbConfig.expand(srcdir = srcprefix.dup) ext = ".#{$OBJEXT}" |