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

merges r21516 from trunk into ruby_1_9_1.

Browse source 
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
	  miniprelude.c, newline.c): copy only when $(srcdir) != pwd.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-01-15 15:39:47 +00:00
parent 2ea541a8c0
commit 2a71b1ca87
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jan 15 12:10:39 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
miniprelude.c, newline.c): copy only when $(srcdir) != pwd.
Wed Jan 14 23:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (rb_locale_charmap): fallback to codepage if no

10
win32/Makefile.sub
View file

@ -768,7 +768,7 @@ ext/extinit.obj: ext/extinit.c $(SETUP)
$(INSNS):
@if exist $(srcdir:/=\)\$(@F) ( \
copy $(srcdir:/=\)\$(@F) $@ \
if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
) else ( \
@$(RM) $(PROGRAM) \
$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \
@ -776,28 +776,28 @@ $(INSNS):
node_name.inc:
@if exist $(srcdir:/=\)\$(@F) ( \
copy $(srcdir:/=\)\$(@F) $@ \
if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
) else ( \
$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ \
)
known_errors.inc:
@if exist $(srcdir:/=\)\$(@F) ( \
copy $(srcdir:/=\)\$(@F) $@ \
if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
) else ( \
$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def \
)
miniprelude.c:
@if exist $(srcdir:/=\)\$(@F) ( \
copy $(srcdir:/=\)\$(@F) $@ \
if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
) else ( \
$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ \
)
newline.c:
@if exist $(srcdir:/=\)\$(@F) ( \
copy $(srcdir:/=\)\$(@F) $@ \
if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \
) else ( \
$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans \
)