kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,

Browse source 
PROGRAM_SUFFIX): unite the differences of the names of macros of
  prefix and suffix.
  reported by HANEDA Norikatsu. [ruby-dev:42775]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2010-12-16 10:55:11 +00:00
parent 698fe540b9
commit b9b26300da
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Dec 16 19:50:12 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,
PROGRAM_SUFFIX): unite the differences of the names of macros of
prefix and suffix.
reported by HANEDA Norikatsu. [ruby-dev:42775]
Thu Dec 16 08:04:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Dec 16 08:04:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* node.h (RNode): match the type of flags to RBasic, and renamed * node.h (RNode): match the type of flags to RBasic, and renamed

4
win32/Makefile.sub
View file

@ -36,7 +36,7 @@ srcdir = ..
RUBY_BASE_NAME = ruby RUBY_BASE_NAME = ruby
!endif !endif
!ifndef RUBY_INSTALL_NAME !ifndef RUBY_INSTALL_NAME
RUBY_INSTALL_NAME = $(PROGRAM_PREFIX)$(RUBY_BASE_NAME)$(RUBY_SUFFIX) RUBY_INSTALL_NAME = $(PROGRAM_PREFIX)$(RUBY_BASE_NAME)$(PROGRAM_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)
@ -689,7 +689,7 @@ s,@LDFLAGS@,$(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,.*,$(RUBY_PREFIX)&$(RUBY_SUFFIX),,;t t s,@program_transform_name@,s,.*,$(PROGRAM_PREFIX)&$(PROGRAM_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

@ -57,13 +57,13 @@ goto :loop
shift shift
goto :loop goto :loop
:pprefix :pprefix
echo>> ~tmp~.mak "RUBY_PREFIX=%~2" \ echo>> ~tmp~.mak "PROGRAM_PREFIX=%~2" \
echo>>confargs.tmp %1=%2 \ echo>>confargs.tmp %1=%2 \
shift shift
shift shift
goto :loop goto :loop
:suffix :suffix
echo>> ~tmp~.mak "RUBY_SUFFIX=%~2" \ echo>> ~tmp~.mak "PROGRAM_SUFFIX=%~2" \
echo>>confargs.tmp %1=%2 \ echo>>confargs.tmp %1=%2 \
shift shift
shift shift

8
win32/setup.mak
View file

@ -175,11 +175,11 @@ MSC_VER = _MSC_VER
-program-name-: -program-name-:
@type << >>$(MAKEFILE) @type << >>$(MAKEFILE)
!ifdef RUBY_PREFIX !ifdef PROGRAM_PREFIX
RUBY_PREFIX = $(RUBY_PREFIX) PROGRAM_PREFIX = $(PROGRAM_PREFIX)
!endif !endif
!ifdef RUBY_SUFFIX !ifdef PROGRAM_SUFFIX
RUBY_SUFFIX = $(RUBY_SUFFIX) PROGRAM_SUFFIX = $(PROGRAM_SUFFIX)
!endif !endif
!ifdef RUBY_INSTALL_NAME !ifdef RUBY_INSTALL_NAME
RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME) RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME)