From fb539f014ef0a1d0d126ac47ab37b0ace7d4b26c Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Apr 2005 15:08:36 +0000
Subject: * lib/mkmf.rb (create_makefile): support platforms have file
 separator   other than /.

* {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
  of building platform.

* {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8367 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 10 ++++++++++
 bcc32/Makefile.sub |  3 +++
 lib/mkmf.rb        | 12 +++++++++++-
 win32/Makefile.sub |  3 +++
 wince/Makefile.sub |  3 +++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c35db9ce0..65cadfbb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): support platforms have file separator
+	  other than /.
+
+	* {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
+	  of building platform.
+
+	* {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.
+
 Wed Apr 20 23:22:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, common.mk: miniruby depens on MINIOBJS.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 96ba22357..c1987971e 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -285,6 +285,7 @@ config.status: $(MKFILES) $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk
 	@type > $@ &&|
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
+s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
@@ -330,6 +331,8 @@ s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@CP@,copy > nul,;t t
+s,@INSTALL@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ecdb54d30..52c18b251 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1038,7 +1038,17 @@ static:		$(STATIC_LIB)#{$extout ? " install-rb" : ""}
       files.each do |f|
 	dest = "#{dir}/#{File.basename(f)}"
 	mfile.print("install-rb#{sfx}: #{dest}\n")
-	mfile.print("#{dest}: #{f}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} #{dir}\n")
+	mfile.print("#{dest}: #{f}\n\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) ")
+	sep = config_string('BUILD_FILE_SEPARATOR')
+	if sep
+	  f = f.gsub("/", sep)
+	  sep = ":/="+sep
+	  f = f.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
+	  f = f.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
+	else
+	  sep = ""
+	end
+	mfile.print("#{f} $(@D#{sep})\n")
       end
     end
   end
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 2e4f7c6bd..0c1a8a968 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -285,6 +285,7 @@ config.status: $(MKFILES) $(srcdir)/win32/Makefile.sub $(srcdir)/common.mk
 	@exit <<$@
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
+s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
@@ -330,6 +331,8 @@ s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@CP@,copy > nul,;t t
+s,@INSTALL@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 823f422e1..2bc6af5ae 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -308,6 +308,7 @@ config.status: $(MKFILES) $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
 	@exit <<$@
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
+s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
@@ -353,6 +354,8 @@ s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@CP@,copy > nul,;t t
+s,@INSTALL@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
-- 
cgit