| 1 | diff -u -r ../advanced/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl |
| 2 | --- ../advanced/buildtools/installnetpbm.pl 2014-12-29 05:18:32.416114132 -0500 |
| 3 | +++ ./buildtools/installnetpbm.pl 2014-12-29 05:18:12.900114119 -0500 |
| 4 | @@ -59,7 +59,7 @@ |
| 5 | "'make package'?\n"); |
| 6 | my $default = "/tmp/netpbm"; |
| 7 | |
| 8 | - my $response = prompt("package directory", $default); |
| 9 | + my $response = $default; |
| 10 | |
| 11 | if (!-f("$response/pkginfo")) { |
| 12 | print("This does not appear to be a Netpbm install package. \n"); |
| 13 | @@ -123,7 +123,7 @@ |
| 14 | $default = "/usr/local/netpbm"; |
| 15 | } |
| 16 | |
| 17 | - my $response = prompt("install prefix", $default); |
| 18 | + my $response = "@TERMUX_PREFIX@"; |
| 19 | |
| 20 | my $prefix; |
| 21 | |
| 22 | @@ -185,7 +185,7 @@ |
| 23 | while (!$binDir) { |
| 24 | my $default = "$prefix/bin"; |
| 25 | |
| 26 | - my $response = prompt("program directory", $default); |
| 27 | + my $response = $default; |
| 28 | |
| 29 | if (-d($response)) { |
| 30 | $binDir = $response; |
| 31 | @@ -243,7 +243,7 @@ |
| 32 | while (!$libDir) { |
| 33 | my $default = "$prefix/lib"; |
| 34 | |
| 35 | - my $response = prompt("shared library directory", $default); |
| 36 | + my $response = $default; |
| 37 | |
| 38 | if (-d($response)) { |
| 39 | $libDir = $response; |
| 40 | @@ -511,7 +511,7 @@ |
| 41 | $done = $FALSE; |
| 42 | |
| 43 | while (!$done) { |
| 44 | - my $response = prompt("Y(es) or N(o)", "Y"); |
| 45 | + my $response = "N"; |
| 46 | |
| 47 | if (uc($response) eq "Y") { |
| 48 | execLdconfig(); |
| 49 | @@ -574,7 +574,7 @@ |
| 50 | while (!$linkDir) { |
| 51 | my $default = "$prefix/lib"; |
| 52 | |
| 53 | - my $response = prompt("static library directory", $default); |
| 54 | + my $response = $default; |
| 55 | |
| 56 | if (-d($response)) { |
| 57 | $linkDir = $response; |
| 58 | @@ -637,7 +637,7 @@ |
| 59 | while (!$dataDir) { |
| 60 | my $default = "$prefix/lib"; |
| 61 | |
| 62 | - my $response = prompt("data file directory", $default); |
| 63 | + my $response = $default; |
| 64 | |
| 65 | if (-d($response)) { |
| 66 | $dataDir = $response; |
| 67 | @@ -674,7 +674,7 @@ |
| 68 | while (!$hdrDir) { |
| 69 | my $default = "$prefix/include"; |
| 70 | |
| 71 | - my $response = prompt("header directory", $default); |
| 72 | + my $response = $default; |
| 73 | |
| 74 | if (-d($response)) { |
| 75 | $hdrDir = $response; |
| 76 | @@ -766,9 +766,9 @@ |
| 77 | my $manDir; |
| 78 | |
| 79 | while (!$manDir) { |
| 80 | - my $default = "$prefix/man"; |
| 81 | + my $default = "$prefix/share/man"; |
| 82 | |
| 83 | - my $response = prompt("man page directory", $default); |
| 84 | + my $response = $default; |
| 85 | |
| 86 | if (-d($response)) { |
| 87 | $manDir = $response; |
| 88 | @@ -820,7 +820,7 @@ |
| 89 | my $done; |
| 90 | |
| 91 | while (!$done) { |
| 92 | - my $response = prompt("create /etc/manweb.conf", "Y"); |
| 93 | + my $response = "N"; |
| 94 | |
| 95 | if (uc($response) eq "Y") { |
| 96 | my $successful = open(MANWEB_CONF, ">/etc/manweb.conf"); |
| 97 | @@ -1102,7 +1102,7 @@ |
| 98 | while (!$pkgconfigDir) { |
| 99 | my $default = "$prefix/lib/pkgconfig"; |
| 100 | |
| 101 | - my $response = prompt("Pkg-config directory", $default); |
| 102 | + my $response = $default; |
| 103 | |
| 104 | if (-d($response)) { |
| 105 | $pkgconfigDir = $response; |