|
@ -1,10 +1,11 @@ |
|
|
diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl
|
|
|
diff -uNr netpbm-10.73.31/buildtools/installnetpbm.pl netpbm-10.73.31.mod/buildtools/installnetpbm.pl
|
|
|
--- ../netpbm-advanced-r3084/buildtools/installnetpbm.pl 2017-10-06 07:49:15.000000000 +0200
|
|
|
--- netpbm-10.73.31/buildtools/installnetpbm.pl 2019-06-29 02:07:55.000000000 +0300
|
|
|
+++ ./buildtools/installnetpbm.pl 2017-10-06 12:18:07.809552955 +0200
|
|
|
+++ netpbm-10.73.31.mod/buildtools/installnetpbm.pl 2020-05-12 00:06:51.166788332 +0300
|
|
|
@@ -32,16 +32,7 @@
|
|
|
@@ -31,17 +31,7 @@
|
|
|
|
|
|
sub prompt($$) { |
|
|
|
|
|
|
|
|
my ($prompt, $default) = @_; |
|
|
my ($prompt, $default) = @_; |
|
|
|
|
|
-
|
|
|
- print("$prompt ($default) ==> ");
|
|
|
- print("$prompt ($default) ==> ");
|
|
|
-
|
|
|
-
|
|
|
- my $response = <STDIN>;
|
|
|
- my $response = <STDIN>;
|
|
@ -19,16 +20,16 @@ diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/ins |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -185,7 +176,7 @@
|
|
|
@@ -123,7 +113,7 @@
|
|
|
$default = "/usr/local/netpbm"; |
|
|
$default = "/usr/local/netpbm"; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
- my $response = fsObjPrompt("install prefix", $default);
|
|
|
- my $response = prompt("install prefix", $default);
|
|
|
+ my $response = "@TERMUX_PREFIX@";
|
|
|
+ my $response = "@TERMUX_PREFIX@";
|
|
|
|
|
|
|
|
|
my $prefix; |
|
|
my $prefix; |
|
|
|
|
|
|
|
|
@@ -573,7 +564,7 @@
|
|
|
@@ -511,7 +501,7 @@
|
|
|
$done = $FALSE; |
|
|
$done = $FALSE; |
|
|
|
|
|
|
|
|
while (!$done) { |
|
|
while (!$done) { |
|
@ -37,3 +38,12 @@ diff -u -r ../netpbm-advanced-r3084/buildtools/installnetpbm.pl ./buildtools/ins |
|
|
|
|
|
|
|
|
if (uc($response) eq "Y") { |
|
|
if (uc($response) eq "Y") { |
|
|
execLdconfig(); |
|
|
execLdconfig(); |
|
|
|
|
|
@@ -967,8 +957,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
removeObsoleteManPage($manDir); |
|
|
|
|
|
|
|
|
|
|
|
- makeInManwebPath("$manDir/web");
|
|
|
|
|
|
-
|
|
|
|
|
|
$$mandirR = $manDir; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|