1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (MakeMakefile#create_makefile): output new macro

Browse Source 
disthdrdir to specify the path of id.h, parse.h and etc.

* ext/ripper/depend: use above macro.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-04-13 12:14:37 +00:00
parent f9ba0dcaa4
commit b77d1a4f34
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sat Apr 13 21:09:02 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#create_makefile): output new macro
disthdrdir to specify the path of id.h, parse.h and etc.
* ext/ripper/depend: use above macro.
Sat Apr 13 20:28:08 2013 NARUSE, Yui <naruse@ruby-lang.org> Sat Apr 13 20:28:08 2013 NARUSE, Yui <naruse@ruby-lang.org>
* Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee. * Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee.

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 \ $(hdrdir)/ruby/util.h \
$(top_srcdir)/node.h \ $(top_srcdir)/node.h \
$(top_srcdir)/internal.h \ $(top_srcdir)/internal.h \
parse.h \ $(disthdrdir)parse.h \
id.h \ $(disthdrdir)id.h \
$(top_srcdir)/regenc.h \ $(top_srcdir)/regenc.h \
$(top_srcdir)/vm_opts.h \ $(top_srcdir)/vm_opts.h \
$(topdir)/probes.h $(topdir)/probes.h

1
lib/mkmf.rb
View File

@ -1822,6 +1822,7 @@ PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
} }
if $extmk if $extmk
mk << "disthdrdir = #{$nmake ? '{$(VPATH)}' : '$(top_srcdir)/'}\n"
mk << "RUBYLIB =\n""RUBYOPT = -\n" mk << "RUBYLIB =\n""RUBYOPT = -\n"
end end
prefix = mkintpath(CONFIG["prefix"]) prefix = mkintpath(CONFIG["prefix"])