* eval.c (rb_eval): added NODE_DSYM, symbol literal with

  interpolation.

* node.h: ditto.

* intern.h: prototypes; rb_is_junk_id, rb_str_dump, rb_str_intern

* object.c (sym_inspect): escape and quote for non-alphanumeric
  symbols.

* parse.y (dsym, tokadd_string, yylex): extended symbol literals.

* parse.y (rb_is_junk_id): added.

* string.c (rb_str_dump, rb_str_intern) : make extern.

* lib/mkmf.rb (create_makefile): deffile should be removed by
  distclean, not clean.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ef2dabab28..7a5f7d339f 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -650,6 +650,7 @@ def create_makefile(target, srcprefix = nil)
   Config::expand(srcdir = srcprefix.dup)
 
   cleanfiles = []
+  distcleanfiles = []
   if EXPORT_PREFIX
     origdef = target + '.def'
     deffile = EXPORT_PREFIX + origdef
@@ -668,14 +669,13 @@ def create_makefile(target, srcprefix = nil)
 	    end
 	  end
 	end
-	cleanfiles << deffile
       else
 	open(deffile, 'wb') do |f|
 	  f.print "EXPORTS\n", EXPORT_PREFIX, "Init_", target, "\n"
 	end
-	cleanfiles << deffile
       end
     end
+    distcleanfiles << deffile unless deffile == origdef
   end
 
   libpath = libpathflag(libpath)
@@ -699,7 +699,7 @@ LIBPATH = #{libpath}
 DEFFILE = #{deffile}
 
 CLEANFILES = #{cleanfiles.join(' ')}
-DISTCLEANFILES =
+DISTCLEANFILES = #{distcleanfiles.join(' ')}
 }
   mfile.print makerules(target, target_prefix)
   dirs = []
@@ -791,7 +791,7 @@ def init_mkmf(config = CONFIG)
   $objs = nil
   $libs = ""
   if $configure_args['--enable-shared'] or config["LIBRUBY"] != config["LIBRUBY_A"]
-  $LIBPATH = ["$(topdir)"]
+    $LIBPATH = ["$(topdir)"]
     $LIBPATH << "$(libdir)" unless $extmk or defined? CROSS_COMPILING
   end
   $LIBPATH << "$(archdir)"