nobu	2008-01-15 14:57:40 +0900 (Tue, 15 Jan 2008)

  New Revision: 15058

  Modified files:
    trunk/ChangeLog
    trunk/bcc32/setup.mak
    trunk/win32/enc-setup.mak
    trunk/win32/setup.mak

  Log:
    * {win,bcc}32/setup.mak (-basic-vars-): expand BASERUBY to full path
      to get rid of ./ruby.exe.
    
    * win32/enc-setup.mak: workaround for Borland make.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/setup.mak?r1=15058&r2=15057&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/setup.mak?r1=15058&r2=15057&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15058&r2=15057&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/enc-setup.mak?r1=15058&r2=15057&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15057)
+++ ChangeLog	(revision 15058)
@@ -1,3 +1,10 @@
+Tue Jan 15 14:57:38 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* {win,bcc}32/setup.mak (-basic-vars-): expand BASERUBY to full path
+	  to get rid of ./ruby.exe.
+
+	* win32/enc-setup.mak: workaround for Borland make.
+
 Tue Jan 15 14:44:53 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (rb_locale_charmap): use ASCII-8BIT in miniruby.
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 15057)
+++ win32/setup.mak	(revision 15058)
@@ -13,7 +13,7 @@
 prefix = /usr
 !endif
 BANG = !
-APPEND = echo>>$(MAKEFILE)
+APPEND = echo.>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -56,6 +56,9 @@
 BASERUBY = $(BASERUBY)
 !endif
 <<
+!if !defined(BASERUBY)
+	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
+!endif
 
 -system-vars-: -runtime-
 
Index: win32/enc-setup.mak
===================================================================
--- win32/enc-setup.mak	(revision 15057)
+++ win32/enc-setup.mak	(revision 15058)
@@ -1,6 +1,6 @@
-BUILTIN_ENCOBJS:
+BUILTIN_ENCOBJS: $(srcdir)/enc/Makefile.in
 
 !include $(srcdir)/enc/Makefile.in
 
-BUILTIN_ENCOBJS: $(srcdir)/enc/Makefile.in
+BUILTIN_ENCOBJS:
 	@echo BUILTIN_ENCOBJS = $(BUILTIN_ENCS:.c=.obj) >> $(MAKEFILE)
Index: bcc32/setup.mak
===================================================================
--- bcc32/setup.mak	(revision 15057)
+++ bcc32/setup.mak	(revision 15058)
@@ -15,7 +15,7 @@
 OS = bccwin32
 RT = $(OS)
 BANG = !
-APPEND = echo>>$(MAKEFILE)
+APPEND = echo.>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -42,7 +42,15 @@
 $(BANG)ifndef prefix
 prefix = $(prefix:\=/)
 $(BANG)endif
+$(BANG)if !defined(BASERUBY)
+!if defined(BASERUBY)
+BASERUBY = $(BASERUBY)
+!endif
 |
+!if !defined(BASERUBY)
+	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
+!endif
+	@$(APPEND) $(BANG)endif
 !if exist(confargs.mk)
 	@type confargs.mk >> $(MAKEFILE)
 	@del confargs.mk

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/