diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-15 05:57:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-15 05:57:40 +0000 |
| commit | 60a05cff2e657aec5e4c16fa2980982bd621c9bf (patch) | |
| tree | b9165e1a9d6957cce0651495e14f785cc655ec36 | |
| parent | 8f1332c537179a5f2f745d4fafacbb587e161086 (diff) | |
| download | ruby-60a05cff2e657aec5e4c16fa2980982bd621c9bf.tar.gz ruby-60a05cff2e657aec5e4c16fa2980982bd621c9bf.tar.xz ruby-60a05cff2e657aec5e4c16fa2980982bd621c9bf.zip | |
* {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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bcc32/setup.mak | 10 | ||||
| -rw-r--r-- | win32/enc-setup.mak | 4 | ||||
| -rw-r--r-- | win32/setup.mak | 5 |
4 files changed, 22 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Tue Jan 15 14:57:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * {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@ruby-lang.org> * encoding.c (rb_locale_charmap): use ASCII-8BIT in miniruby. diff --git a/bcc32/setup.mak b/bcc32/setup.mak index 0e0bb45d0..1cc87f3e8 100644 --- a/bcc32/setup.mak +++ b/bcc32/setup.mak @@ -15,7 +15,7 @@ prefix = /usr OS = bccwin32 RT = $(OS) BANG = ! -APPEND = echo>>$(MAKEFILE) +APPEND = echo.>>$(MAKEFILE) !ifdef MAKEFILE MAKE = $(MAKE) -f $(MAKEFILE) !else @@ -42,7 +42,15 @@ $(BANG)endif $(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 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- |