archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) r39290:

Browse source 
* lib/mkmf.rb: remove extra topdir in VPATH, which was in
	  win32/Makefile.sub for some reason and moved from there.
	  [ruby-dev:46998] [Bug #7864]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2013-02-23 03:58:51 +00:00
parent 3ecab2256f
commit a3b2161c6d
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Feb 23 12:58:32 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: remove extra topdir in VPATH, which was in
win32/Makefile.sub for some reason and moved from there.
[ruby-dev:46998] [Bug #7864]
Tue Feb 23 12:07:00 2013 Kenta MURATA <mrkn@mrkn.jp> Tue Feb 23 12:07:00 2013 Kenta MURATA <mrkn@mrkn.jp>
* backport r39321 from trunk. [ruby-core:51777] [Bug #7761] * backport r39321 from trunk. [ruby-core:51777] [Bug #7761]

2
lib/mkmf.rb
View file

@ -2343,7 +2343,7 @@ site-install-rb: install-rb
$LIBPATH = [] $LIBPATH = []
$INSTALLFILES = [] $INSTALLFILES = []
$NONINSTALLFILES = [/~\z/, /\A#.*#\z/, /\A\.#/, /\.bak\z/i, /\.orig\z/, /\.rej\z/, /\.l[ao]\z/, /\.o\z/] $NONINSTALLFILES = [/~\z/, /\A#.*#\z/, /\A\.#/, /\.bak\z/i, /\.orig\z/, /\.rej\z/, /\.l[ao]\z/, /\.o\z/]
$VPATH = %w[$(srcdir) $(topdir) $(arch_hdrdir)/ruby $(hdrdir)/ruby] $VPATH = %w[$(srcdir) $(arch_hdrdir)/ruby $(hdrdir)/ruby]
$objs = nil $objs = nil
$srcs = nil $srcs = nil