kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb (MakeMakefile#create_makefile): remove {$(VPATH)} other

Browse source 
than nmke.

* ext/ripper/depend: use VPATH expecting removed by above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-04-13 18:00:25 +00:00
parent 34b706ff0a
commit 34f5700a09
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sun Apr 14 02:46:50 2013 NARUSE, Yui <naruse@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#create_makefile): remove {$(VPATH)} other
than nmke.
* ext/ripper/depend: use VPATH expecting removed by above.
Sat Apr 13 23:06:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (timestamp_file): gather timestamp files in one

4
ext/ripper/depend
View file

@ -15,8 +15,8 @@ ripper.o: ripper.c id.c lex.c eventids1.c eventids2.c eventids2table.c \
$(hdrdir)/ruby/util.h \
$(top_srcdir)/node.h \
$(top_srcdir)/internal.h \
$(disthdrdir)parse.h \
$(disthdrdir)id.h \
{$(VPATH)}parse.h \
{$(VPATH)}id.h \
$(top_srcdir)/regenc.h \
$(top_srcdir)/vm_opts.h \
$(topdir)/probes.h

2
lib/mkmf.rb
View file

@ -1822,7 +1822,6 @@ PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
}
if $extmk
mk << "disthdrdir = #{$nmake ? '{$(VPATH)}' : '$(top_srcdir)/'}\n"
mk << "RUBYLIB =\n""RUBYOPT = -\n"
end
prefix = mkintpath(CONFIG["prefix"])
@ -2004,6 +2003,7 @@ RULES
end
depend.each_line do |line|
line.gsub!(/\.o\b/, ".#{$OBJEXT}")
line.gsub!(/\{\$\(VPATH\)\}/, "") unless $nmake
line.gsub!(/\$\((?:hdr|top)dir\)\/config.h/, $config_h)
line.gsub!(%r"\$\(hdrdir\)/(?!ruby(?![^:;/\s]))(?=[-\w]+\.h)", '\&ruby/')
if $nmake && /\A\s*\$\(RM|COPY\)/ =~ line