diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-12 11:19:22 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-12 11:19:22 +0000 |
| commit | 21410f4dfeee36f9dbadc611492516ebf2a427fa (patch) | |
| tree | 3d3a19eed5242acb8d8a6c8a31b250c1680bff2c /lib | |
| parent | 0d8a0904d93e9600ccd095eabd5e4165c15987ff (diff) | |
* configure.in (rb_cv_noreturn): default for platforms not support
prototypes.
* ruby.c (ruby_init_loadpath): buffer for path name should have
MAXPATHLEN.
* lib/mkmf.rb (configuration): include topdir and hdrdir in VPATH.
* lib/mkmf.rb (create_makefile): default dependency rule.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c6180282ec..39da5dfeb4 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -727,6 +727,10 @@ end def configuration(srcdir) mk = [] + vpath = %w[$(srcdir) $(topdir) $(hdrdir)] + if $mingw && CONFIG['build_os'] == 'cygwin' + vpath.each {|p| p.sub!(/.*/, '$(shell cygpath -u \&)')} + end mk << %{ SHELL = /bin/sh @@ -735,7 +739,7 @@ SHELL = /bin/sh srcdir = #{srcdir} topdir = #{$topdir} hdrdir = #{$hdrdir} -VPATH = #{$mingw && CONFIG['build_os'] == 'cygwin' ? '$(shell cygpath -u $(srcdir))' : '$(srcdir)'} +VPATH = #{vpath.join(File::PATH_SEPARATOR)} } drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/ if destdir = CONFIG["prefix"].scan(drive)[0] and !destdir.empty? @@ -982,6 +986,9 @@ site-install-rb: install-rb mfile.print line end end + else + vpath = ($nmake ? "{$(hdrdir)}" : "") + mfile.print "$(OBJS): #{vpath}ruby.h #{vpath}defines.h #{$config_h}\n" end ensure mfile.close if mfile |