summaryrefslogtreecommitdiff
path: root/bcc32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-02 13:35:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-02 13:35:31 +0000
commitd338ca56f5298117b934ec08bc856d47efb54cc7 (patch)
treec5931c3bc0d0a31f1346f61da1716341eb54a39c /bcc32
parent29798fee394f350cb8f95acedfdbf82a7e92de62 (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 'bcc32')
-rw-r--r--bcc32/Makefile.sub2
-rw-r--r--bcc32/configure.bat2
-rw-r--r--bcc32/setup.mak13
3 files changed, 11 insertions, 6 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 5fe7937..78e1309 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -292,7 +292,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/bcc32/configure.bat b/bcc32/configure.bat
index 91a4028..d68fd19 100644
--- a/bcc32/configure.bat
+++ b/bcc32/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-bccwin32]
echo Optional Package:
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 1a243af..5d4a372 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -9,7 +9,9 @@ srcdir = $(bcc32dir:/bcc32/=/)
!else
srcdir = $(bcc32dir)../
!endif
-
+!ifndef prefix
+prefix = /usr
+!endif
OS = bccwin32
RT = $(OS)
INCLUDE = !include
@@ -33,6 +35,11 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
@type > $(MAKEFILE) &&|
\#\#\# Makefile for ruby $(OS) \#\#\#
srcdir = $(srcdir:\=/)
+prefix = $(prefix:\=/)
+EXTSTATIC = $(EXTSTATIC)
+!if defined(RDOCTARGET)
+RDOCTARGET = $(RDOCTARGET)
+!endif
|
@cpp32 -I$(srcdir) -DRUBY_EXTERN="//" -P- -o$(MAKEFILE) > nul &&|
\#include "version.h"
@@ -77,7 +84,6 @@ PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
\# RT = $(RT)
\# RUBY_INSTALL_NAME = ruby
\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-\# prefix = /usr
\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
\# STACK = 0x2000000
@@ -86,6 +92,5 @@ PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
$(INCLUDE) $$(srcdir)bcc32/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).