You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

106 lines
3.1 KiB

10 years ago
diff -u -r ../advanced/buildtools/installnetpbm.pl ./buildtools/installnetpbm.pl
--- ../advanced/buildtools/installnetpbm.pl 2014-12-29 05:18:32.416114132 -0500
+++ ./buildtools/installnetpbm.pl 2014-12-29 05:18:12.900114119 -0500
@@ -59,7 +59,7 @@
"'make package'?\n");
my $default = "/tmp/netpbm";
- my $response = prompt("package directory", $default);
+ my $response = $default;
if (!-f("$response/pkginfo")) {
print("This does not appear to be a Netpbm install package. \n");
@@ -123,7 +123,7 @@
$default = "/usr/local/netpbm";
}
- my $response = prompt("install prefix", $default);
+ my $response = "@TERMUX_PREFIX@";
my $prefix;
@@ -185,7 +185,7 @@
while (!$binDir) {
my $default = "$prefix/bin";
- my $response = prompt("program directory", $default);
+ my $response = $default;
if (-d($response)) {
$binDir = $response;
@@ -243,7 +243,7 @@
while (!$libDir) {
my $default = "$prefix/lib";
- my $response = prompt("shared library directory", $default);
+ my $response = $default;
if (-d($response)) {
$libDir = $response;
@@ -511,7 +511,7 @@
$done = $FALSE;
while (!$done) {
- my $response = prompt("Y(es) or N(o)", "Y");
+ my $response = "N";
if (uc($response) eq "Y") {
execLdconfig();
@@ -574,7 +574,7 @@
while (!$linkDir) {
my $default = "$prefix/lib";
- my $response = prompt("static library directory", $default);
+ my $response = $default;
if (-d($response)) {
$linkDir = $response;
@@ -637,7 +637,7 @@
while (!$dataDir) {
my $default = "$prefix/lib";
- my $response = prompt("data file directory", $default);
+ my $response = $default;
if (-d($response)) {
$dataDir = $response;
@@ -674,7 +674,7 @@
while (!$hdrDir) {
my $default = "$prefix/include";
- my $response = prompt("header directory", $default);
+ my $response = $default;
if (-d($response)) {
$hdrDir = $response;
@@ -766,9 +766,9 @@
my $manDir;
while (!$manDir) {
- my $default = "$prefix/man";
+ my $default = "$prefix/share/man";
- my $response = prompt("man page directory", $default);
+ my $response = $default;
if (-d($response)) {
$manDir = $response;
@@ -820,7 +820,7 @@
my $done;
while (!$done) {
- my $response = prompt("create /etc/manweb.conf", "Y");
+ my $response = "N";
if (uc($response) eq "Y") {
my $successful = open(MANWEB_CONF, ">/etc/manweb.conf");
@@ -1102,7 +1102,7 @@
while (!$pkgconfigDir) {
my $default = "$prefix/lib/pkgconfig";
- my $response = prompt("Pkg-config directory", $default);
+ my $response = $default;
if (-d($response)) {
$pkgconfigDir = $response;