From 60a05cff2e657aec5e4c16fa2980982bd621c9bf Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 15 Jan 2008 05:57:40 +0000
Subject: * {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.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/enc-setup.mak | 4 ++--
 win32/setup.mak     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'win32')

diff --git a/win32/enc-setup.mak b/win32/enc-setup.mak
index 2b51c4bf6..bc4df0fdc 100644
--- a/win32/enc-setup.mak
+++ b/win32/enc-setup.mak
@@ -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)
diff --git a/win32/setup.mak b/win32/setup.mak
index 205f1f956..455b6ae83 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -13,7 +13,7 @@ srcdir = $(WIN32DIR)/..
 prefix = /usr
 !endif
 BANG = !
-APPEND = echo>>$(MAKEFILE)
+APPEND = echo.>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -56,6 +56,9 @@ EXTOUT = $(EXTOUT)
 BASERUBY = $(BASERUBY)
 !endif
 <<
+!if !defined(BASERUBY)
+	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
+!endif
 
 -system-vars-: -runtime-
 
-- 
cgit