* 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
This commit is contained in:
usa 2008-10-03 05:04:57 +00:00
Родитель 10e9b63806
Коммит bfdadb885a
4 изменённых файлов: 17 добавлений и 2 удалений

Просмотреть файл

@ -1,3 +1,8 @@
Fri Oct 3 14:04:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/{configure.bat,setup.mak,Makefile.sub): add --program-prefix
configure option support.
Thu Oct 2 21:22:43 2008 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* lib/cgi/core.rb (CGI::QueryExtension): delete MorphingBody

Просмотреть файл

@ -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

Просмотреть файл

@ -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 \

Просмотреть файл

@ -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