diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-08-23 08:18:19 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-08-23 08:18:19 +0000 |
| commit | 4fc6c3f7d0a51108e5a13595fdb23a65ffd23e9c (patch) | |
| tree | e814241897641759fdadda80f2f2033a3b9e0ff7 /win32 | |
| parent | 7e7a67a62afbcd23f0d74cf6138bbdd414f338b1 (diff) | |
* configure.in: RUBY_SO_NAME is msvcrt-rubyXX on mswin32/mingw32.
* configure.in (sitearch): new var.
* mkconfig.rb, lib/mkmf.rb (sitearch): ditto.
* win32/Makefile.sub, win32/setup.mak (sitearch): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 4 | ||||
| -rw-r--r-- | win32/setup.mak | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 930fb0473..3e60d08a5 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -60,6 +60,7 @@ DEBUGFLAGS = -Zi OPTFLAGS = -O2b2xg- !endif OS = mswin32 +RT = msvcrt !if !defined(prefix) prefix = /usr @@ -252,7 +253,7 @@ config.h: Makefile $(srcdir)/win32/Makefile.sub #define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/1.7" #define RUBY_PLATFORM "$(ARCH)-$(OS)" #define RUBY_ARCHLIB "/lib/ruby/1.7/$(ARCH)-$(OS)" -#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/$(ARCH)-$(OS)" +#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/1.7/$(ARCH)-$(RT)" <<KEEP config.status: Makefile $(srcdir)/win32/Makefile.sub $(MINIRUBY) @@ -331,6 +332,7 @@ s,@SOLIBS@,$(SOLIBS),;t t s,@DLDLIBS@,$(DLDLIBS),;t t s,@ENABLE_SHARED@,yes,;t t s,@arch@,$(ARCH)-$(OS),;t t +s,@sitearch@,$(ARCH)-$(RT),;t t s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t s,@configure_input@,$$configure_input,;t t diff --git a/win32/setup.mak b/win32/setup.mak index 353493a1c..d5694c5f6 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -8,6 +8,7 @@ srcdir = $(WIN32DIR:/win32=) srcdir = $(WIN32DIR)/.. !ENDIF OS = mswin32 +RT = msvcrt all: ext all: Makefile @@ -17,7 +18,7 @@ Makefile: @echo ### makefile for ruby $(OS) ###> $@ @echo srcdir = $(srcdir:\=/)>> $@ @echo RUBY_INSTALL_NAME = ruby>> $@ - @echo RUBY_SO_NAME = $(OS)-$$(RUBY_INSTALL_NAME)17>> $@ + @echo RUBY_SO_NAME = $(RT)-$$(RUBY_INSTALL_NAME)17>> $@ @echo prefix = /usr>> $@ @echo CFLAGS = -nologo -MD -DNT=1 $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)>> $@ @echo CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\">> $@ |