1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program

Browse Source 
name transform.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-09-08 00:00:12 +00:00
parent 58b0275a4c
commit eba74dc219
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Sep 8 08:59:30 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
name transform.
Fri Sep 8 08:25:39 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Sep 8 08:25:39 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb: suppress `assigning void value' warning. * lib/optparse.rb: suppress `assigning void value' warning.

4
win32/Makefile.sub
View File

@ -17,7 +17,7 @@ LIB = $(pathlist:;=/lib;)
srcdir = .. srcdir = ..
!endif !endif
!ifndef RUBY_INSTALL_NAME !ifndef RUBY_INSTALL_NAME
RUBY_INSTALL_NAME = ruby RUBY_INSTALL_NAME = ruby$(RUBY_SUFFIX)
!endif !endif
!if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)" !if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw) RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
@ -361,7 +361,7 @@ s,@LDFLAGS@,,;t t
s,@LIBS@,$(LIBS),;t t s,@LIBS@,$(LIBS),;t t
s,@exec_prefix@,$${prefix},;t t s,@exec_prefix@,$${prefix},;t t
s,@prefix@,$(prefix),;t t s,@prefix@,$(prefix),;t t
s,@program_transform_name@,s,,,,;t t s,@program_transform_name@,s,$$,$(RUBY_SUFFIX),,;t t
s,@bindir@,$${exec_prefix}/bin,;t t s,@bindir@,$${exec_prefix}/bin,;t t
s,@sbindir@,$${exec_prefix}/sbin,;t t s,@sbindir@,$${exec_prefix}/sbin,;t t
s,@libexecdir@,$${exec_prefix}/libexec,;t t s,@libexecdir@,$${exec_prefix}/libexec,;t t

4
win32/configure.bat
View File

@ -19,7 +19,9 @@ if "%1" == "--target" goto :target
if "%1" == "target" goto :target if "%1" == "target" goto :target
if "%1" == "--with-static-linked-ext" goto :extstatic if "%1" == "--with-static-linked-ext" goto :extstatic
if "%1" == "--program-suffix" goto :suffix if "%1" == "--program-suffix" goto :suffix
if "%1" == "--program-name" goto :progname if "%1" == "--program-name" goto :installname
if "%1" == "--install-name" goto :installname
if "%1" == "--so-name" goto :soname
if "%1" == "--enable-install-doc" goto :enable-rdoc if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc if "%1" == "--disable-install-doc" goto :disable-rdoc
if "%1" == "--extout" goto :extout if "%1" == "--extout" goto :extout

15
win32/setup.mak
View File

@ -32,7 +32,7 @@ i586-$(OS): -prologue- -i586- -epilogue-
i686-$(OS): -prologue- -i686- -epilogue- i686-$(OS): -prologue- -i686- -epilogue-
alpha-$(OS): -prologue- -alpha- -epilogue- alpha-$(OS): -prologue- -alpha- -epilogue-
-prologue-: -basic-vars- -system-vars- -version- -prologue-: -basic-vars- -system-vars- -version- -program-name-
-basic-vars-: nul -basic-vars-: nul
@type << > $(MAKEFILE) @type << > $(MAKEFILE)
@ -120,6 +120,19 @@ TEENY = RUBY_VERSION_TEENY
MSC_VER = _MSC_VER MSC_VER = _MSC_VER
<< <<
-program-name-:
@type << >>$(MAKEFILE)
!ifdef RUBY_SUFFIX
RUBY_SUFFIX = $(RUBY_SUFFIX)
!endif
!ifdef RUBY_INSTALL_NAME
RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME)
!endif
!ifdef RUBY_SO_NAME
RUBY_SO_NAME = $(RUBY_SO_NAME)
!endif
<<
-generic-: nul -generic-: nul
!if defined($(ARCH)) || defined($(CPU)) !if defined($(ARCH)) || defined($(CPU))
@type << >>$(MAKEFILE) @type << >>$(MAKEFILE)