diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-04-02 06:48:45 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-04-02 06:48:45 +0000 |
| commit | 1c6a8e4debc677e9729352015c4f264cf293c5e7 (patch) | |
| tree | ba7390fd303e50950bab61c71176d178dc49d825 /ext/extmk.rb.in | |
| parent | 1cfece051cc64106c5ce18dfa75496633ac97069 (diff) | |
* Makefile.in (CPPFLAGS): remove @includedir@.
* lib/mkmf.rb (create_makefile): ditto.
* ext/extmk.rb.in (create_makefile): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb.in')
| -rw-r--r-- | ext/extmk.rb.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index f191af7678..3588385877 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -25,7 +25,6 @@ end SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"] $extlist = [] -$includedir = "@includedir@" $libdir = "@libdir@" $top_srcdir = "@top_srcdir@" @@ -76,8 +75,8 @@ if /mswin32/ =~ RUBY_PLATFORM else OUTFLAG = '-o ' end -LINK = "@CC@ #{OUTFLAG}conftest -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@" -CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir %s %s %s conftest.c" +LINK = "@CC@ #{OUTFLAG}conftest -I#$topdir -I#$top_srcdir #{CFLAGS} @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@" +CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} %s %s %s conftest.c" $log = open('extmk.log', 'w') @@ -415,7 +414,7 @@ hdrdir = #{$top_srcdir} CC = @CC@ CFLAGS = %s #{CFLAGS} #$CFLAGS -CPPFLAGS = -I$(topdir) -I$(hdrdir) -I@includedir@ %s #$CPPFLAGS +CPPFLAGS = -I$(topdir) -I$(hdrdir) %s #$CPPFLAGS DLDFLAGS = #$DLDFLAGS #$LDFLAGS LDSHARED = @LDSHARED@ #{defflag} ", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" ") |