1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
Index: ruby-1.9.3-p194/lib/mkmf.rb
===================================================================
--- ruby-1.9.3-p194.orig/lib/mkmf.rb
+++ ruby-1.9.3-p194/lib/mkmf.rb
@@ -1998,11 +1998,10 @@ static: $(STATIC_LIB)#{$extout ? " insta
dirs = []
mfile.print "install: install-so install-rb\n\n"
sodir = (dir = "$(RUBYARCHDIR)").dup
- mfile.print("install-so: ")
if target
f = "$(DLLIB)"
dest = "#{dir}/#{f}"
- mfile.puts dir, "install-so: #{dest}"
+ mfile.puts "install-so: #{dest}"
if $extout
mfile.print "clean-so::\n"
mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
@@ -2015,7 +2014,7 @@ static: $(STATIC_LIB)#{$extout ? " insta
end
end
else
- mfile.puts "Makefile"
+ mfile.puts "install-so: Makefile"
end
mfile.print("install-rb: pre-install-rb install-rb-default\n")
mfile.print("install-rb-default: pre-install-rb-default\n")
@@ -2024,14 +2023,11 @@ static: $(STATIC_LIB)#{$extout ? " insta
for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]]
files = install_files(mfile, i, nil, srcprefix) or next
for dir, *files in files
- unless dirs.include?(dir)
- dirs << dir
- mfile.print "pre-install-rb#{sfx}: #{dir}\n"
- end
for f in files
dest = "#{dir}/#{File.basename(f)}"
- mfile.print("install-rb#{sfx}: #{dest} #{dir}\n")
+ mfile.print("install-rb#{sfx}: #{dest}\n")
mfile.print("#{dest}: #{f}\n")
+ mfile.print("\t$(Q) $(MAKEDIRS) $(@D#{sep})\n")
mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
if defined?($installed_list) and !$extout
mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
@@ -2054,8 +2050,6 @@ static: $(STATIC_LIB)#{$extout ? " insta
end
end
end
- dirs.unshift(sodir) if target and !dirs.include?(sodir)
- dirs.each {|d| mfile.print "#{d}:\n\t$(Q) $(MAKEDIRS) $@\n"}
mfile.print <<-SITEINSTALL
|
GitWeb
