diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Fri Apr 23 23:24:47 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb: $hdrdir should not contain macros, for backward + compatibility. [bruby-dev:28] + + * lib/mkmf.rb (create_makefile): in the case of extout, just copy + script files, without comparison. + Fri Apr 23 16:38:46 2004 Tanaka Akira <akr@m17n.org> * lib/pathname.rb: sync taint/freeze flag between diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 307c5b314f..2b0612d772 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -80,8 +80,7 @@ end libdir = File.dirname(__FILE__) $extmk = libdir != Config::CONFIG["rubylibdir"] if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h") - $topdir = Config::CONFIG["archdir"] - $hdrdir = $archdir + $hdrdir = $topdir = Config::CONFIG["archdir"] elsif File.exist?(($top_srcdir ||= File.dirname(libdir)) + "/ruby.h") and File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h") $hdrdir = $top_srcdir @@ -782,6 +781,7 @@ RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'} MAKEDIRS = $(RUBY) -run -e mkdir -- -p INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755 INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644 +COPY = $(RUBY) -run -e cp -- -v #### End of system configuration section. #### @@ -939,7 +939,7 @@ static: $(STATIC_LIB) files.each do |f| dest = "#{dir}/#{File.basename(f)}" mfile.print("install-rb: #{dest}\n") - mfile.print("#{dest}: #{f}\n\t@$(INSTALL_DATA) #{f} #{dir}\n") + mfile.print("#{dest}: #{f}\n\t@$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} #{dir}\n") end end end |