diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 | ||||
| -rwxr-xr-x | win32/configure.bat | 4 | ||||
| -rw-r--r-- | win32/setup.mak | 8 |
4 files changed, 15 insertions, 8 deletions
@@ -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> * node.h (RNode): match the type of flags to RBasic, and renamed diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 134cd424c8..a8fb2b889d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -36,7 +36,7 @@ srcdir = .. RUBY_BASE_NAME = ruby !endif !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 !if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)" RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw) @@ -689,7 +689,7 @@ s,@LDFLAGS@,$(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_PREFIX)&$(RUBY_SUFFIX),,;t t +s,@program_transform_name@,s,.*,$(PROGRAM_PREFIX)&$(PROGRAM_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 c2d696eee1..f613528618 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -57,13 +57,13 @@ goto :loop shift
goto :loop
:pprefix
- echo>> ~tmp~.mak "RUBY_PREFIX=%~2" \
+ echo>> ~tmp~.mak "PROGRAM_PREFIX=%~2" \
echo>>confargs.tmp %1=%2 \
shift
shift
goto :loop
:suffix
- echo>> ~tmp~.mak "RUBY_SUFFIX=%~2" \
+ echo>> ~tmp~.mak "PROGRAM_SUFFIX=%~2" \
echo>>confargs.tmp %1=%2 \
shift
shift
diff --git a/win32/setup.mak b/win32/setup.mak index 45fcee0956..4ba0ceec3d 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -175,11 +175,11 @@ MSC_VER = _MSC_VER -program-name-: @type << >>$(MAKEFILE) -!ifdef RUBY_PREFIX -RUBY_PREFIX = $(RUBY_PREFIX) +!ifdef PROGRAM_PREFIX +PROGRAM_PREFIX = $(PROGRAM_PREFIX) !endif -!ifdef RUBY_SUFFIX -RUBY_SUFFIX = $(RUBY_SUFFIX) +!ifdef PROGRAM_SUFFIX +PROGRAM_SUFFIX = $(PROGRAM_SUFFIX) !endif !ifdef RUBY_INSTALL_NAME RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME) |