diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-22 05:58:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-22 05:58:10 +0000 |
| commit | e10564a578f1824847285063607d46b2cfdb96d7 (patch) | |
| tree | 4abbff4e8ed49549fb749d22d613968a15da90ef | |
| parent | d65d5e76615515a78fe84d361b81569b803785c9 (diff) | |
| download | ruby-e10564a578f1824847285063607d46b2cfdb96d7.tar.gz | |
* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/digest/sha2/extconf.rb | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -1,9 +1,11 @@ -Sun Feb 22 14:44:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Feb 22 14:58:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/extmk.rb: $extstatic is Array or nil now. [ruby-talk:93383] * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: terminate options. + * lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated. + Sun Feb 22 13:05:37 2004 akira yamada <akira@ruby-lang.org> * lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment. diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb index 53698a7bcb..fbc5d6c249 100644 --- a/ext/digest/sha2/extconf.rb +++ b/ext/digest/sha2/extconf.rb @@ -3,7 +3,7 @@ require "mkmf" -$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.." +$CPPFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.." $objs = [ "sha2.#{$OBJEXT}", diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6f6592b5df..92fc97d726 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -999,7 +999,7 @@ def init_mkmf(config = CONFIG) $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup $LDFLAGS = (with_config("ldflags") || "").dup - $INCFLAGS = "-I#{$topdir}" + $INCFLAGS = "-I$(topdir)" $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup $LIBEXT = config['LIBEXT'].dup $OBJEXT = config["OBJEXT"].dup |