summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-09 21:27:10 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-09 21:27:10 +0000
commit1732b6fa4e0c292c30404d009dbb7cd3e2abb602 (patch)
tree35256f82a2c193df021844419500c33bb996ccf3 /ext
parentdb537ebae35f162e89a38672155886c080d529f1 (diff)
eban
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/extmk.rb.in3
-rw-r--r--ext/tcltklib/depend1
-rw-r--r--ext/tcltklib/extconf.rb2
3 files changed, 4 insertions, 2 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 617753f..b0cd861 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -550,7 +550,8 @@ def extmake(target)
ldir = "-L"+dir if dir
end
- $CFLAGS = idir || ""
+ $CFLAGS = ""
+ $CPPFLAGS = idir || ""
$LDFLAGS = ldir || ""
begin
diff --git a/ext/tcltklib/depend b/ext/tcltklib/depend
index e91f9da..2cd9c40 100644
--- a/ext/tcltklib/depend
+++ b/ext/tcltklib/depend
@@ -1 +1,2 @@
tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb
index acc75b8..58f2708 100644
--- a/ext/tcltklib/extconf.rb
+++ b/ext/tcltklib/extconf.rb
@@ -50,6 +50,6 @@ if have_header("tcl.h") && have_header("tk.h") &&
"/usr/X11/lib", "/usr/X11R6/lib", "/usr/openwin/lib")) &&
find_tcl(tcllib, stubs) &&
find_tk(tklib, stubs)
- $CFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
+ $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
create_makefile("tcltklib")
end