diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-23 10:17:30 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-23 10:17:30 +0000 |
commit | 377f1dbae99073055d4807ec15fcf44d9094e828 (patch) | |
tree | 87328c69b8296e0ecd38a456e2c4d74e40f28184 /lib/mkmf.rb | |
parent | 6c86f1f185e67a4fce120538804929d599e65129 (diff) | |
download | ruby-377f1dbae99073055d4807ec15fcf44d9094e828.tar.gz ruby-377f1dbae99073055d4807ec15fcf44d9094e828.tar.xz ruby-377f1dbae99073055d4807ec15fcf44d9094e828.zip |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@2985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
-rw-r--r-- | lib/mkmf.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ef2dabab2..7a5f7d339 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)" |