|
|
@@ -1,7 +1,7 @@
|
|
|
Index: cvs/install.pl
|
|
|
---- cvs/install.pl.orig 2007-07-21 10:28:58 +0200
|
|
|
-+++ cvs/install.pl 2007-07-29 09:55:24 +0200
|
|
|
-@@ -110,11 +110,11 @@
|
|
|
+--- cvs/install.pl.orig 2008-05-17 16:22:38 +0200
|
|
|
++++ cvs/install.pl 2008-05-18 12:06:39 +0200
|
|
|
+@@ -112,11 +112,11 @@
|
|
|
}
|
|
|
|
|
|
# prior installation may not have supported .makepp/*.mk files
|
|
|
@@ -16,7 +16,7 @@ Index: cvs/install.pl
|
|
|
while( <F> ) {
|
|
|
$found = 1, last if /build_info_subdir.+\.mk/;
|
|
|
}
|
|
|
-@@ -160,13 +160,13 @@
|
|
|
+@@ -162,13 +162,13 @@
|
|
|
@sig_num{split ' ', $Config{sig_name}} = split ' ', $Config{sig_num};
|
|
|
$USR1 = $sig_num{USR1}; $USR1 = $USR1; # suppress used-only-once warning
|
|
|
|
|
|
@@ -26,14 +26,14 @@ Index: cvs/install.pl
|
|
|
|
|
|
-substitute_file( $_, $datadir, 0644 ) for
|
|
|
+substitute_file( $_, "$ENV{DESTDIR}$datadir", 0644 ) for
|
|
|
- qw(recursive_makepp FileInfo_makepp.pm);
|
|
|
+ qw(recursive_makepp FileInfo_makepp.pm BuildCacheControl.pm);
|
|
|
|
|
|
-make_dir("$datadir/$_") for
|
|
|
+make_dir("$ENV{DESTDIR}$datadir/$_") for
|
|
|
qw(ActionParser BuildCheck CommandParser Scanner Signature);
|
|
|
- foreach $module (qw(AutomakeFixer BuildCache BuildCacheControl FileInfo Glob MakeEvent
|
|
|
+ foreach $module (qw(AutomakeFixer BuildCache FileInfo Glob MakeEvent
|
|
|
Makecmds Makefile Makesubs Rule TextSubs Utils
|
|
|
-@@ -187,13 +187,13 @@
|
|
|
+@@ -189,13 +189,13 @@
|
|
|
Signature Signature/c_compilation_md5 Signature/md5
|
|
|
Signature/shared_object Signature/verilog_simulation_md5
|
|
|
Signature/verilog_synthesis_md5)) {
|
|
|
@@ -51,7 +51,7 @@ Index: cvs/install.pl
|
|
|
}
|
|
|
|
|
|
#
|
|
|
-@@ -212,11 +212,11 @@
|
|
|
+@@ -214,11 +214,11 @@
|
|
|
my $manfile = $file;
|
|
|
$manfile =~ s/\.pod$/.1/; # Get the name of the man file.
|
|
|
$manfile =~ s@^pod/@@;
|
|
|
@@ -65,7 +65,7 @@ Index: cvs/install.pl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-@@ -383,8 +383,8 @@
|
|
|
+@@ -387,8 +387,8 @@
|
|
|
$nav .= join '<br />', map $link{$_}, @links;
|
|
|
}
|
|
|
$nav .= '</td></tr></table>';
|
|
|
@@ -76,7 +76,7 @@ Index: cvs/install.pl
|
|
|
s/\.html$//;
|
|
|
my $title = (s/^makepp(?:_|$)// ? 'Makepp ' : '') . $alias{$_ || 'makepp'};
|
|
|
my $index;
|
|
|
-@@ -536,11 +536,11 @@
|
|
|
+@@ -540,11 +540,11 @@
|
|
|
unlink $tmp;
|
|
|
|
|
|
for( qw'google.png makepp.gif makepp.css pre.png sflogo.png url.png' ) {
|
|
|
@@ -91,7 +91,7 @@ Index: cvs/install.pl
|
|
|
}
|
|
|
|
|
|
#
|
|
|
-@@ -633,6 +633,7 @@
|
|
|
+@@ -637,6 +637,7 @@
|
|
|
}
|
|
|
|
|
|
sub read_with_prompt {
|
