* instruby.rb: fix install directory if destdir and compile_dir are

  not in the same drive.

* ext/extmk.rb: ditto.

* win32/Makefile.sub, win32/README.win32, win32/configure.bat,
  win32/setup.mak: new configure scheme. use ``configure --prefix=dir''
  instead of ``nmake DESTDIR=dir install''.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 19 insertions, 0 deletions

diff --git a/win32/configure.bat b/win32/configure.bat
index 33dd89307c..d61ae6b3ef 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -10,10 +10,13 @@ echo>> ~tmp~.mak 	@del ~tmp~.mak
 echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)/setup.mak \

 :loop

 if "%1" == "" goto :end

+if "%1" == "--prefix" goto :prefix

 if "%1" == "--srcdir" goto :srcdir

 if "%1" == "srcdir" goto :srcdir

 if "%1" == "--target" goto :target

 if "%1" == "target" goto :target

+if "%1" == "-h" goto :help

+if "%1" == "--help" goto :help

   echo>> ~tmp~.mak 	"%1" \

   shift

 goto :loop

@@ -22,11 +25,27 @@ goto :loop
   shift

   shift

 goto :loop

+:prefix

+  echo>> ~tmp~.mak 	"prefix=%2" \

+  shift

+  shift

+goto :loop

 :target

   echo>> ~tmp~.mak 	"%2" \

   shift

   shift

 goto :loop

+:help

+  echo Configuration:

+  echo   --help            display this help

+  echo   --srcdir=DIR      find the sources in DIR [configure dir or `..']

+  echo Installation directories:

+  echo   --prefix=PREFIX   install files in PREFIX [/usr]

+  echo System types:

+  echo   --target=TARGET   configure for TARGET [i386-mswin32]

+  del ~tmp~.mak

+goto :exit

 :end

 echo>> ~tmp~.mak 	WIN32DIR=$(@D)

 nmake -alf ~tmp~.mak

+:exit