From: Katsuyuki Komatsu <komatsu@...>
Date: 2000-07-26T13:20:26+09:00
Subject: [ruby-dev:10409] Re: environment variables

小松です。

In the message of [ruby-dev:10407] Re: environment variables
    on 2000/7/26 12:06:24 Katsuyuki Komatsu <komatsu@sarion.co.jp> wrote:
> あとは、ソースと同じディレクトリでのconfigureの件が残っています。

このぐらいでいいかな。

diff -ru1p ruby-1.5.4.nakada/win32/configure.bat ruby-1.5.4/win32/configure.bat
--- ruby-1.5.4.nakada/win32/configure.bat	Wed Jul 26 11:33:51 2000
+++ ruby-1.5.4/win32/configure.bat	Wed Jul 26 12:48:35 2000
@@ -1,6 +1,8 @@
 @echo off
-set TMPMAKE=~tmp~.mak
-echo $(conf):; @$(MAKE) -$(MAKEFLAGS) -f $(@D:\=/)/setup.mak \> %TMPMAKE%
-if not "%1" == "" echo 	srcdir="%1" \>> %TMPMAKE%
-echo 	WIN32DIR=$(@D:\=/) >> %TMPMAKE%
-nmake -f %TMPMAKE% -a conf="%0"
+rem Don't set environment variable in batch file other than autoexec.bat
+rem to avoid "Out of environment space" problem on Windows 95/98.
+rem set TMPMAKE=~tmp~.mak
+echo $(conf):; @$(MAKE) -$(MAKEFLAGS) -f $(@D:\=/)/setup.mak \>> ~tmp~.mak
+if not "%1" == "" echo 	srcdir=%1 \>> ~tmp~.mak
+echo 	WIN32DIR=$(@D:\=/) >> ~tmp~.mak
+nmake -nologo -f ~tmp~.mak -a conf="%0" TMPMAKE=~tmp~.mak
diff -ru1p ruby-1.5.4.nakada/win32/setup.mak ruby-1.5.4/win32/setup.mak
--- ruby-1.5.4.nakada/win32/setup.mak	Wed Jul 26 11:33:51 2000
+++ ruby-1.5.4/win32/setup.mak	Wed Jul 26 12:48:35 2000
@@ -2,4 +2,11 @@
 
+!IF "$(WIN32DIR)" == "win32"
+srcdir = .
+!ELSE
 srcdir = $(WIN32DIR:/win32=)
+!ENDIF
 
+!IF "$(WIN32DIR)" == "."
+all: bad_directory
+!ELSE
 all: config.h config.status
@@ -8,2 +15,3 @@ all: Makefile
 all:; @echo type `nmake' to make ruby for mswin32.
+!ENDIF
 
@@ -17,3 +25,6 @@ config.h config.status: $(srcdir)/win32/
 
-ext:;	@mkdir $@
+ext:;	@if not exist $@\* mkdir $@
 
+bad_directory:
+	@del $(TMPMAKE)
+	@echo ERROR: Please `configure' other than `win32' directory.

--
小松克行 / Katsuyuki Komatsu <komatsu@sarion.co.jp>