summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-03 05:04:57 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-03 05:04:57 +0000
commitbfdadb885a95443853dafcc1aeecd26b1f4900e6 (patch)
tree49a0e03e238d36f0cf734c23c951d41e1c1ae8e4 /win32
parent10e9b638069d9e40233242693814b86c672e423e (diff)
* win32/{configure.bat,setup.mak,Makefile.sub): add --program-prefix
configure option support. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub4
-rwxr-xr-xwin32/configure.bat7
-rw-r--r--win32/setup.mak3
3 files changed, 12 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index cc16a5a44b..eb296abce8 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -31,7 +31,7 @@ LIB = $(pathlist:;=/lib;)
srcdir = ..
!endif
!ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = ruby$(RUBY_SUFFIX)
+RUBY_INSTALL_NAME = $(PROGRAM_PREFIX)ruby$(RUBY_SUFFIX)
!endif
!if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
@@ -543,7 +543,7 @@ s,@LDFLAGS@,,;t t
s,@LIBS@,$(LIBS),;t t
s,@exec_prefix@,$${prefix},;t t
s,@prefix@,$(prefix),;t t
-s,@program_transform_name@,s,$$,$(RUBY_SUFFIX),,;t t
+s,@program_transform_name@,s,.*,$(RUBY_PREFIX)&$(RUBY_SUFFIX),,;t t
s,@bindir@,$${exec_prefix}/bin,;t t
s,@sbindir@,$${exec_prefix}/sbin,;t t
s,@libexecdir@,$${exec_prefix}/libexec,;t t
diff --git a/win32/configure.bat b/win32/configure.bat
index 0ec9fde9a6..f9d287b21c 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -18,6 +18,7 @@ if "%1" == "srcdir" goto :srcdir
if "%1" == "--target" goto :target
if "%1" == "target" goto :target
if "%1" == "--with-static-linked-ext" goto :extstatic
+if "%1" == "--program-prefix" goto :pprefix
if "%1" == "--program-suffix" goto :suffix
if "%1" == "--program-name" goto :installname
if "%1" == "--install-name" goto :installname
@@ -44,6 +45,12 @@ goto :loop
shift
shift
goto :loop
+:pprefix
+ echo>> ~tmp~.mak "RUBY_PREFIX=%2" \
+ echo>>confargs.tmp %1=%2 \
+ shift
+ shift
+goto :loop
:suffix
echo>> ~tmp~.mak "RUBY_SUFFIX=%2" \
echo>>confargs.tmp %1=%2 \
diff --git a/win32/setup.mak b/win32/setup.mak
index 9ca6daa5c6..39a00e8fae 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -154,6 +154,9 @@ MSC_VER = _MSC_VER
-program-name-:
@type << >>$(MAKEFILE)
+!ifdef RUBY_PREFIX
+RUBY_PREFIX = $(RUBY_PREFIX)
+!endif
!ifdef RUBY_SUFFIX
RUBY_SUFFIX = $(RUBY_SUFFIX)
!endif