diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-16 10:55:11 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-16 10:55:11 +0000 |
| commit | b9b26300da434f0bca833aa6603274dcffe756b9 (patch) | |
| tree | c86d5e74829367fafcc7bd32153ebfd07e177f18 /win32/Makefile.sub | |
| parent | 698fe540b9ac94b2cf7e7261a47d1f5b7d8d09d0 (diff) | |
| download | ruby-b9b26300da434f0bca833aa6603274dcffe756b9.tar.gz | |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 4 |
1 files changed, 2 insertions, 2 deletions
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 |