diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-02 13:35:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-02 13:35:31 +0000 |
| commit | d338ca56f5298117b934ec08bc856d47efb54cc7 (patch) | |
| tree | c5931c3bc0d0a31f1346f61da1716341eb54a39c /win32 | |
| parent | 29798fee394f350cb8f95acedfdbf82a7e92de62 (diff) | |
* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
config.status for backward compatibility. fixed: [ruby-core:04649]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rwxr-xr-x | win32/configure.bat | 2 | ||||
| -rw-r--r-- | win32/setup.mak | 12 |
3 files changed, 10 insertions, 6 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index b65d3e4f11..8e0144c660 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -290,7 +290,7 @@ s,@FFLAGS@,$(FFLAGS),;t t s,@LDFLAGS@,,;t t s,@LIBS@,$(LIBS),;t t s,@exec_prefix@,$${prefix},;t t -s,@prefix@,$(prefix),;t t +s,@prefix@,,;t t s,@program_transform_name@,s,,,,;t t s,@bindir@,$${exec_prefix}/bin,;t t s,@sbindir@,$${exec_prefix}/sbin,;t t diff --git a/win32/configure.bat b/win32/configure.bat index 11383e08bd..b2b3a175bf 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -72,7 +72,7 @@ goto :loop echo --help display this help
echo --srcdir=DIR find the sources in DIR [configure dir or `..']
echo Installation directories:
- echo --prefix=PREFIX install files in PREFIX [/usr]
+ echo --prefix=PREFIX install files in PREFIX (ignored currently)
echo System types:
echo --target=TARGET configure for TARGET [i386-mswin32]
echo Optional Package:
diff --git a/win32/setup.mak b/win32/setup.mak index 5e2ea21e5f..fa0c260001 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -9,6 +9,9 @@ srcdir = $(WIN32DIR:/win32=) !else srcdir = $(WIN32DIR)/.. !endif +!ifndef prefix +prefix = /usr +!endif OS = mswin32 RT = msvcrt INCLUDE = !include @@ -20,6 +23,7 @@ MAKEFILE = Makefile !endif ARCH = PROCESSOR_ARCHITECTURE CPU = PROCESSOR_LEVEL +CPP = cl -nologo -EP all: -prologue- -generic- -epilogue- i386-$(OS): -prologue- -i386- -epilogue- @@ -32,11 +36,13 @@ alpha-$(OS): -prologue- -alpha- -epilogue- @type << > $(MAKEFILE) ### Makefile for ruby $(OS) ### srcdir = $(srcdir:\=/) +prefix = $(prefix:\=/) +EXTSTATIC = $(EXTSTATIC) !if defined(RDOCTARGET) RDOCTARGET = $(RDOCTARGET) !endif << - @cl -nologo -EP -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE) + @$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE) #include "version.h" MAJOR = RUBY_VERSION_MAJOR MINOR = RUBY_VERSION_MINOR @@ -76,7 +82,6 @@ $(CPU) = $(PROCESSOR_LEVEL) # RT = $(RT) # RUBY_INSTALL_NAME = ruby # RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR) -# prefix = /usr # CFLAGS = -nologo -MD $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) # CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\" # STACK = 0x2000000 @@ -87,6 +92,5 @@ $(CPU) = $(PROCESSOR_LEVEL) $(INCLUDE) $$(srcdir)/win32/Makefile.sub << - @if exist config.h del config.h - @if exist config.status del config.status + @$(srcdir:/=\)\win32\rm.bat config.h config.status @echo type `$(MAKE)' to make ruby for $(OS). |