[前][次][番号順一覧][スレッド一覧]

ruby-changes:36962

From: nobu <ko1@a...>
Date: Sun, 28 Dec 2014 18:13:32 +0900 (JST)
Subject: [ruby-changes:36962] nobu:r49043 (trunk): mkmf.rb: use echo if possible

nobu	2014-12-28 18:13:21 +0900 (Sun, 28 Dec 2014)

  New Revision: 49043

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49043

  Log:
    mkmf.rb: use echo if possible
    
    * lib/mkmf.rb (create_makefile): use echo for simple contents.

  Modified files:
    trunk/lib/mkmf.rb
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 49042)
+++ lib/mkmf.rb	(revision 49043)
@@ -2190,10 +2190,10 @@ RULES https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2190
       if File.exist?(File.join(srcdir, target + '.def'))
         deffile = "$(srcdir)/$(TARGET).def"
         unless EXPORT_PREFIX.empty?
-          makedef = %{-pe "$_.sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
+          makedef = %{$(RUBY) -pe "$$_.sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i" #{deffile}}
         end
       else
-        makedef = %{-e "puts 'EXPORTS', '$(TARGET_ENTRY)'"}
+        makedef = %{(echo EXPORTS && echo $(TARGET_ENTRY))}
       end
       if makedef
         $cleanfiles << '$(DEFFILE)'
@@ -2411,7 +2411,7 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2411
     if makedef
       mfile.print "$(DEFFILE): #{origdef}\n"
       mfile.print "\t$(ECHO) generating $(@#{rsep})\n"
-      mfile.print "\t$(Q) $(RUBY) #{makedef} #{origdef} > $@\n\n"
+      mfile.print "\t$(Q) #{makedef} > $@\n\n"
     end
 
     depend = File.join(srcdir, "depend")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]