diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 01:44:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 01:44:56 +0000 |
| commit | d43ef66b1276a938af79cec316faa5c7dbd559a3 (patch) | |
| tree | 408fa36ed4415ba9d1eaafe84985614477f99029 /win32/Makefile.sub | |
| parent | d58e799d41e2139db6b066d6b14dcddc64c9fc53 (diff) | |
| download | ruby-d43ef66b1276a938af79cec316faa5c7dbd559a3.tar.gz | |
RUBY_PROGRAM_VERSION from RUBY_VERSION
* configure.in, win32/setup.mak: extract RUBY_PROGRAM_VERSION from
RUBY_VERSION in version.h instead of RUBY_API_VERSION numbers in
include/ruby/version.h, and cut it into version numbers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 85093a7c00..336e56af3b 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -24,6 +24,10 @@ LARGEFILE_SUPPORT = 1 win_srcdir = $(srcdir)/win32 !endif +!if exist(verconf.mk) +! include verconf.mk +!endif + #### Start of system configuration section. #### !if defined(pathlist) @@ -424,9 +428,6 @@ PRELUDE_C = prelude.c RBCONFIG = ./.rbconfig.time !include $(srcdir)/common.mk -!if exist(verconf.mk) -! include verconf.mk -!endif !ifdef SCRIPTPROGRAMS !else if [echo>scriptbin.mk SCRIPTPROGRAMS = \] @@ -926,7 +927,7 @@ s,@sitearchincludedir@,$${includedir}/$${sitearch},;t t s,@arch@,$(ARCH)-$(PLATFORM),;t t s,@sitearch@,$(ARCH)-$(RT),;t t s,@ruby_version@,$(ruby_version),;t t -s,@RUBY_PROGRAM_VERSION@,$(ruby_version),;t t +s,@RUBY_PROGRAM_VERSION@,$(RUBY_PROGRAM_VERSION),;t t s,@rubylibprefix@,$${prefix}/lib/$${RUBY_BASE_NAME},;t t s,@rubyarchdir@,$${rubylibdir}/$${arch},;t t s,@rubylibdir@,$${rubylibprefix}/$${ruby_version},;t t |