* Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local):

  separate files under directories due to directory separator.

* */Makefile.sub (MKFILES): common.mk and */Makefile.sub should not be
  removed.

* win32/Makefile.sub, wince/Makefile.sub: $* cannot appear in explicit
  rules.

* cygwin/GNUmakefile.in: some mingw stuffs were missed.

* lib/mkmf.rb (create_makefile): Borland make wrongly removes braces
  from command lines.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 18 insertions, 15 deletions

diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index d8c2462824..78996709d1 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 SHELL = $(COMSPEC)
-MKFILES = Makefile $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
+MKFILES = Makefile
 NULL = nul
 
 #### Start of system configuration section. ####
@@ -178,7 +178,7 @@ DLDOBJS       =
 
 WINMAINOBJ    = wincemain.$(OBJEXT)
 
-all:
+all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
 ruby: $(PROGRAM)
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
@@ -297,10 +297,11 @@ $(BANG)endif
 #endif
 <<KEEP
 
-config.status: $(MKFILES)
+config.status: $(MKFILES) $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
 	@echo Creating <<$@
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
+s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
@@ -412,10 +413,11 @@ $(LIBRUBY_A):	$(OBJS) $(DMYEXT)
 $(LIBRUBY):	$(RUBYDEF)
 		$(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
 
-$(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $*.res
+$(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
 		@echo. $(DLDOBJS)
-		$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) $*.res $(LIBS) \
-			-Fe$@ $(LDFLAGS) $(LIBRUBY_DLDFLAGS)
+		$(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
+			$(RUBY_SO_NAME).res $(LIBS) -Fe$@ $(LDFLAGS) \
+			$(LIBRUBY_DLDFLAGS)
 
 $(RUBYDEF):	$(LIBRUBY_A) $(PREP)
 		$(MINIRUBY) $(srcdir)/win32/mkexports.rb \
diff --git a/wince/README.wince b/wince/README.wince
index 795dc710e6..b4c8de2e09 100644
--- a/wince/README.wince
+++ b/wince/README.wince
@@ -6,9 +6,7 @@
 
 (1) eMbedded Visual C++ 3.0 or later.
 
-(2) If you want to run `((%nmake clean%))' or `((%nmake distclean%))'
-    properly, you must install UNIX compatible `((%rm%))' command on
-    your ((|PATH|)) if you want to clean after compile.
+(2) ruby executable on the compiling host environment.
 
 (3) Please set environment variable (({INCLUDE})), (({LIB})), (({PATH})),
     (({CE_TOOLS_DIR})), (({EMBEDDED_TOOLS_DIR})) to run required commands
@@ -25,6 +23,9 @@
 (1) Execute wince\configure.bat on your build directory.
     You can specify the target platform as an argument.
     For example, run `((%configure arm-hpc2k-wince%))'
+    You can also specify the install directory.
+    For example, run `((%configure --prefix=<install_directory>%))'
+    Default of the install directory is /usr .
 
 (2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
     if you want to change the name of the executable files. 
@@ -79,9 +80,9 @@ in Japanese, but you can download at least.
 
     C:
     cd \ruby
-    win32\configure
+    win32\configure --prefix=/usr/local
     nmake
-    nmake DESTDIR=/usr/local install
+    nmake install
 
 * Build on the relative directory from the ruby source directory.
 
@@ -94,9 +95,9 @@ in Japanese, but you can download at least.
     cd \ruby
     mkdir mswin32
     cd mswin32
-    ..\win32\configure
+    ..\win32\configure --prefix=/usr/local
     nmake
-    nmake DESTDIR=/usr/local install
+    nmake install
 
 * Build on the different drive.
 
@@ -107,9 +108,9 @@ in Japanese, but you can download at least.
 
     D:
     cd D:\build\ruby
-    C:\src\ruby\win32\configure
+    C:\src\ruby\win32\configure --prefix=C:/usr/local
     nmake
-    nmake DESTDIR=C:/usr/local install
+    nmake install
 
 == Bugs