diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-23 06:41:22 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-01-23 06:41:22 +0000 |
| commit | b69642052686971d0694732ee02d742f11982deb (patch) | |
| tree | 67ab16e42050bfcabecbbfa8be63132bbf2038c8 /win32 | |
| parent | 06720d45c74de5b0a000ebb04148623e4bb03fc2 (diff) | |
| download | ruby-b69642052686971d0694732ee02d742f11982deb.tar.gz | |
* Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,
setup.mak}: add --with-baseruby configure option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 3 | ||||
| -rwxr-xr-x | win32/configure.bat | 8 | ||||
| -rw-r--r-- | win32/setup.mak | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index fc4d9af596..d4cac0d26f 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -51,6 +51,9 @@ AR = lib -nologo PURIFY = AUTOCONF = autoconf RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat +!if !defined(BASERUBY) +BASERUBY = ruby +!endif !if !defined(PROCESSOR_ARCHITECTURE) PROCESSOR_ARCHITECTURE = x86 diff --git a/win32/configure.bat b/win32/configure.bat index 5f5420f520..96e2ab40c3 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -26,6 +26,7 @@ if "%1" == "--enable-install-doc" goto :enable-rdoc if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout
if "%1" == "--path" goto :path
+if "%1" == "--with-baseruby" goto :baseruby
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
echo>>confargs.tmp %1 \
@@ -94,6 +95,12 @@ goto :loop shift
shift
goto :loop
+:baseruby
+ echo>> ~tmp~.mak "BASERUBY=%2" \
+ echo>>confargs.tmp %1=%2 \
+ shift
+ shift
+goto :loop
:help
echo Configuration:
echo --help display this help
@@ -103,6 +110,7 @@ goto :loop echo System types:
echo --target=TARGET configure for TARGET [i386-mswin32]
echo Optional Package:
+ echo --with-baseruby=RUBY use RUBY as baseruby [ruby]
echo --with-static-linked-ext link external modules statically
echo --disable-install-doc do not install rdoc indexes during install
del *.tmp
diff --git a/win32/setup.mak b/win32/setup.mak index e4f874434a..797ed56a02 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -47,6 +47,9 @@ RDOCTARGET = $(RDOCTARGET) !if defined(EXTOUT) EXTOUT = $(EXTOUT) !endif +!if defined(BASERUBY) +BASERUBY = $(BASERUBY) +!endif << -system-vars-: -osname- -runtime- |