Author: Tom Parker-Shemilt Summary: Enables non-interactive builds installnetpbm.pl defaults to wanting keyboard interactivity, which we don't want! ---- --- a/buildtools/installnetpbm.pl.orig 2022-12-24 23:19:19.790601595 -0500 +++ b/buildtools/installnetpbm.pl 2022-12-24 23:24:36.093232453 -0500 @@ -247,6 +247,7 @@ while (!$binDir) { my $default = "$prefix/bin"; + return $default; my $response = fsObjPrompt("program directory", $default); @@ -305,6 +306,7 @@ while (!$libDir) { my $default = "$prefix/lib"; + return $default; my $response = fsObjPrompt("shared library directory", $default); @@ -568,7 +570,8 @@ "you have\n"); print("installed the library in a directory Ldconfig knows about.\n"); print("\n"); - + + return; my $done; $done = $FALSE; @@ -637,6 +640,7 @@ while (!$linkDir) { my $default = "$prefix/lib"; + return $default; my $response = fsObjPrompt("shared library stub directory", $default); @@ -821,6 +825,7 @@ while (!$linkDir) { my $default = "$prefix/lib"; + return $default; my $response = fsObjPrompt("static library directory", $default); @@ -886,6 +891,7 @@ while (!$dataDir) { my $default = "$prefix/lib"; + return $default; my $response = fsObjPrompt("data file directory", $default); @@ -923,6 +929,7 @@ while (!$hdrDir) { my $default = "$prefix/include"; + return $default; my $response = fsObjPrompt("header directory", $default); @@ -1126,6 +1133,7 @@ while (!$pkgconfigDir) { my $default = "$prefix/lib/pkgconfig"; + return $default; my $response = fsObjPrompt("Pkg-config directory", $default); @@ -1207,12 +1215,12 @@ print("installation by running 'make package'. See the INSTALL file.\n"); print("\n"); -my $pkgdir = getPkgdir(); +my $pkgdir = $ENV{'BUILDDIR'} . "/pkgdir"; print("Installing from package directory '$pkgdir'\n"); print("\n"); -my $prefix = getPrefix(); +my $prefix = $ENV{'PKGDIR'} . "/usr"; print("Using prefix '$prefix'\n"); print("\n");