From 4fc08fd17d839f673275292d023363b6860cded8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Nov 2010 14:17:26 +0000
Subject: * lib/mkmf.rb (create_makefile): use forward slashes in messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  4 +++-
 lib/mkmf.rb        |  8 +++++---
 win32/Makefile.sub | 14 +++++++-------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 658203d762..026bb98f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Wed Nov 17 19:13:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov 17 23:17:22 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): use forward slashes in messages.
 
 	* lib/mkmf.rb (create_makefile): make extension libraries messages
 	  brief.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 6a49c280f3..624b4cbc3e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1884,9 +1884,11 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
       s = s.gsub(/(\$\(\w+)(\))/) {$1+sep+$2}
       s = s.gsub(/(\$\{\w+)(\})/) {$1+sep+$2}
     }
+    rsep = ":#{fsep}=/"
   else
     fseprepl = proc {|s| s}
     sep = ""
+    rsep = ""
   end
   dirs = []
   mfile.print "install: install-so install-rb\n\n"
@@ -1964,7 +1966,7 @@ site-install-rb: install-rb
   mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
   mfile.print "\n"
 
-  compile_command = "\n\t$(ECHO) compiling $<\n\t$(Q) %s\n\n"
+  compile_command = "\n\t$(ECHO) compiling $(<#{rsep})\n\t$(Q) %s\n\n"
   CXX_EXT.each do |e|
     COMPILE_RULES.each do |rule|
       mfile.printf(rule, e, $OBJEXT)
@@ -1998,7 +2000,7 @@ site-install-rb: install-rb
   mfile.print link_so, "\n\n"
   unless $static.nil?
     mfile.print "$(STATIC_LIB): $(OBJS)\n\t@-$(RM) $(@#{sep})\n\t"
-    mfile.print "$(ECHO) linking static-library $(@)\n\t$(Q) "
+    mfile.print "$(ECHO) linking static-library $(@#{rsep})\n\t$(Q) "
     mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)"
     config_string('RANLIB') do |ranlib|
       mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true"
@@ -2007,7 +2009,7 @@ site-install-rb: install-rb
   mfile.print "\n\n"
   if makedef
     mfile.print "$(DEFFILE): #{origdef}\n"
-    mfile.print "\t$(ECHO) generating $@\n"
+    mfile.print "\t$(ECHO) generating $(@#{rsep})\n"
     mfile.print "\t$(Q) $(RUBY) #{makedef} #{origdef} > $@\n\n"
   end
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ac0839fc51..a14c87d855 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -785,7 +785,7 @@ miniruby: miniruby$(EXEEXT)
 
 miniruby$(EXEEXT):
 		@echo $(LIBS)
-		$(ECHO) linking $@
+		$(ECHO) linking $(@:\=/)
 		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS)
 		@$(RM) miniruby.lib miniruby.exp
 		$(Q) miniruby.exe -v
@@ -797,7 +797,7 @@ miniruby.rc:
 
 !if "$(PROGRAM)" != ""
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
-		$(ECHO) linking $@
+		$(ECHO) linking $(@:\=/)
 		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
 			$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)
 		$(Q) $(LDSHARED_0)
@@ -807,7 +807,7 @@ $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 
 !if "$(WPROGRAM)" != ""
 $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
-		$(ECHO) linking $@
+		$(ECHO) linking $(@:\=/)
 		$(Q) $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \
 			$(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \
 			-link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows
@@ -817,17 +817,17 @@ $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
 !endif
 
 $(LIBRUBY_A):	$(OBJS) $(DMYEXT)
-		$(ECHO) linking static-library $@
+		$(ECHO) linking static-library $(@:\=/)
 		$(Q) $(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT)
 
 $(LIBRUBY):	$(RUBYDEF)
-		$(ECHO) linking import-library $@
+		$(ECHO) linking import-library $(@:\=/)
 		$(Q) $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF)
 
 $(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
 		@echo $(DLDOBJS)
 		@-$(PRE_LIBRUBY_UPDATE)
-		$(ECHO) linking shared-library $@
+		$(ECHO) linking shared-library $(@:\=/)
 		$(Q) $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \
 			$(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \
 			$(LIBRUBY_DLDFLAGS)
@@ -837,7 +837,7 @@ $(LIBRUBY_SO):	$(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
 		$(Q) $(LDSHARED_2)
 
 $(RUBYDEF):	$(LIBRUBY_A) $(PREP)
-		$(ECHO) generating $@
+		$(ECHO) generating $(@:\=/)
 		$(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb \
 		  -output=$@ -arch=$(ARCH) $(LIBRUBY_A)
 
-- 
cgit v1.2.3