From c389b3bb637a32a12d2445bfcd958d1b3c033c19 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jun 2007 05:47:12 +0000
Subject: * Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc.

* ext/extmk.rb (parse_args): add also topdir to mflags.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 6 ++++++
 Makefile.in        | 2 +-
 ext/extmk.rb       | 2 +-
 win32/Makefile.sub | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf6c475ab6..1b47597d91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 10 14:48:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc.
+
+	* ext/extmk.rb (parse_args): add also topdir to mflags.
+
 Sun Jun 10 13:47:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
diff --git a/Makefile.in b/Makefile.in
index 506fcbeb44..534ec91e48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,7 @@ VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
 empty =
 OUTFLAG = @OUTFLAG@$(empty)
 CFLAGS = @CFLAGS@ @ARCH_FLAG@
-XCFLAGS = -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
+XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = 
diff --git a/ext/extmk.rb b/ext/extmk.rb
index d4be9fc538..17b918d1be 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -289,7 +289,7 @@ def parse_args()
     $extout = '$(topdir)/'+$extout
     RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
     $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
-    $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
+    $mflags << "topdir=#$topdir" << "extout=#$extout" << "extout_prefix=#$extout_prefix"
   end
 end
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 88bf4f8958..282fbb22e1 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -151,7 +151,7 @@ ARFLAGS = -machine:$(MACHINE) -out:
 CC = $(CC) -nologo
 LD = $(CC)
 LDSHARED = $(LD) -LD
-XCFLAGS = -DRUBY_EXPORT -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
+XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
 !if $(MSC_VER) >= 1400
 # Prevents VC++ 2005 (cl ver 14) warnings
 CPPFLAGS = $(CPPFLAGS) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-- 
cgit v1.2.3