diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-04-22 08:57:42 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-04-22 08:57:42 +0000 |
| commit | e429f1c5844a6efb3c013416e007e77775a16fa3 (patch) | |
| tree | 3edb0805f07e90e2a4f360a006700d3a942805bc /ext/extmk.rb.in | |
| parent | 089d61b4247f5e7e95bfa7dd3c0daa6cbe45fe92 (diff) | |
1.1b9_14
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb.in')
| -rw-r--r-- | ext/extmk.rb.in | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 2ea88ee2dd..5aba725301 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -59,13 +59,11 @@ end if PLATFORM == "m68k-human" CFLAGS = "@CFLAGS@".gsub(/-c..-stack=[0-9]+ */, '') -LINK = "@CC@ -o conftest -I#{$topdir} " + CFLAGS + " %s @LDFLAGS@ %s conftest.c @LIBS@ %s" -CPP = "@CPP@ @CPPFLAGS@ -I#{$topdir} " + CFLAGS + " %s conftest.c" else CFLAGS = "@CFLAGS@" -LINK = "@CC@ -o conftest -I#{$topdir} " + CFLAGS + " %s @LDFLAGS@ %s conftest.c %s" -CPP = "@CPP@ @CPPFLAGS@ -I#{$topdir} " + CFLAGS + " %s conftest.c" end +LINK = "@CC@ -o conftest -I#{$topdir} " + CFLAGS + " %s @LDFLAGS@ %s conftest.c @LIBS@ %s" +CPP = "@CPP@ @CPPFLAGS@ -I#{$topdir} " + CFLAGS + " %s conftest.c" if /win32|djgpp|mingw32|m68k-human/i =~ PLATFORM $null = open("nul", "w") @@ -76,6 +74,9 @@ end $orgerr = $stderr.dup $orgout = $stdout.dup def xsystem command + if $DEBUG + return system(command) + end $stderr.reopen($null) $stdout.reopen($null) r = system(command) @@ -238,7 +239,8 @@ hdrdir = #{$topdir} CC = @CC@ -CFLAGS = %s -I#{$topdir} %s #$CFLAGS %s +prefix = @prefix@ +CFLAGS = %s -I@includedir@ -I#{$topdir} %s #$CFLAGS %s DLDFLAGS = @DLDFLAGS@ #$LDFLAGS LDSHARED = @LDSHARED@ ", if $static then "" else "@CCDLFLAGS@" end, CFLAGS, $defs.join(" ") @@ -274,6 +276,7 @@ libdir = @libdir@/$(RUBY_INSTALL_NAME)/@arch@ TARGET = %s.%s INSTALL = %s@INSTALL@ +INSTALL_DATA = %s@INSTALL_DATA@ binsuffix = @binsuffix@ @@ -285,7 +288,7 @@ clean:; @rm -f *.o *.so *.sl realclean: clean ", target, - if $static then "o" else "@DLEXT@" end, $dots + if $static then "o" else "@DLEXT@" end, $dots, $dots mfile.printf "\ @@ -298,7 +301,7 @@ install: " end for rb in Dir["lib/*.rb"] - mfile.printf "\t$(INSTALL) %s @libdir@/$(RUBY_INSTALL_NAME)\n", rb + mfile.printf "\t$(INSTALL_DATA) %s @libdir@/$(RUBY_INSTALL_NAME)\n", rb end mfile.printf "\n" |