From e9f83e070e678d44e83191f2d9a081eae13c5868 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 12 Mar 2004 11:19:22 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@5942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c6180282e..39da5dfeb 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 -- cgit