summaryrefslogtreecommitdiff
path: root/wince
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 /wince
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 'wince')
-rw-r--r--wince/Makefile.sub2
-rw-r--r--wince/configure.bat2
-rw-r--r--wince/setup.mak12
3 files changed, 11 insertions, 5 deletions
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 1dfa07d..5306f5a 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -316,7 +316,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/wince/configure.bat b/wince/configure.bat
index 3ec2757..3f208d1 100644
--- a/wince/configure.bat
+++ b/wince/configure.bat
@@ -82,7 +82,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/wince/setup.mak b/wince/setup.mak
index adab346..14663df 100644
--- a/wince/setup.mak
+++ b/wince/setup.mak
@@ -9,6 +9,9 @@ srcdir = $(WIN32DIR:/win32=)
!else
srcdir = $(WIN32DIR)/..
!endif
+!ifndef prefix
+prefix = /usr
+!endif
OS = mswince
RT = msvcrt
INCLUDE = !include
@@ -47,6 +50,11 @@ armv4i-sig3-wince: -prologue- -armv4i- -sig3- -epilogue-
@type << > $(MAKEFILE)
### Makefile for ruby $(OS) ###
srcdir = $(srcdir:\=/)
+prefix = $(prefix:\=/)
+EXTSTATIC = $(EXTSTATIC)
+!if defined(RDOCTARGET)
+RDOCTARGET = $(RDOCTARGET)
+!endif
<<
@$(CPP) -I$(srcdir) -DRUBY_EXTERN="//" <<"Creating $(MAKEFILE)" >> $(MAKEFILE)
#include "version.h"
@@ -216,7 +224,6 @@ RUBY_SO_NAME = $(RUBY_SO_NAME)
!else
# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
!endif
-# prefix = /usr
# CFLAGS = -nologo $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)
CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -I$$(srcdir)/wince \
$$(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$$(SUBSYSVERSION:.=) \
@@ -230,6 +237,5 @@ CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -I$$(srcdir)/wince \
$(INCLUDE) $$(srcdir)/wince/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).