1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb: $hdrdir should not contain macros, for backward

Browse Source 
compatibility.  [bruby-dev:28]

* lib/mkmf.rb (create_makefile): in the case of extout, just copy
  script files, without comparison.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6206 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-04-23 14:24:51 +00:00
parent cd322e0403
commit 7792d9026a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> Fri Apr 23 16:38:46 2004 Tanaka Akira <akr@m17n.org>
* lib/pathname.rb: sync taint/freeze flag between * lib/pathname.rb: sync taint/freeze flag between

6
lib/mkmf.rb
View File

@ -80,8 +80,7 @@ end
libdir = File.dirname(__FILE__) libdir = File.dirname(__FILE__)
$extmk = libdir != Config::CONFIG["rubylibdir"] $extmk = libdir != Config::CONFIG["rubylibdir"]
if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h") if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h")
$topdir = Config::CONFIG["archdir"] $hdrdir = $topdir = Config::CONFIG["archdir"]
$hdrdir = $archdir
elsif File.exist?(($top_srcdir ||= File.dirname(libdir)) + "/ruby.h") and elsif File.exist?(($top_srcdir ||= File.dirname(libdir)) + "/ruby.h") and
File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h") File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h")
$hdrdir = $top_srcdir $hdrdir = $top_srcdir
@ -782,6 +781,7 @@ RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
MAKEDIRS = $(RUBY) -run -e mkdir -- -p MAKEDIRS = $(RUBY) -run -e mkdir -- -p
INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755 INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755
INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644 INSTALL_DATA = $(RUBY) -run -e install -- -vpm 0644
COPY = $(RUBY) -run -e cp -- -v
#### End of system configuration section. #### #### End of system configuration section. ####
@ -939,7 +939,7 @@ static: $(STATIC_LIB)
files.each do |f| files.each do |f|
dest = "#{dir}/#{File.basename(f)}" dest = "#{dir}/#{File.basename(f)}"
mfile.print("install-rb: #{dest}\n") 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 end
end end