move UDP and fix linkoo to look for INPATH and UPD in config_host.mk

config_host.mk.in

@@ -360,6 +360,7 @@ export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
 export THES_SYSTEM_DIR="@THES_SYSTEM_DIR@"
 export TYPO_EXTENSION_PACK="@TYPO_EXTENSION_PACK@"
 export UNIXWRAPPERNAME="@UNIXWRAPPERNAME@"
+export UPD="@UPD@"
 export USE_FT_EMBOLDEN="@USE_FT_EMBOLDEN@"
 export USE_XINERAMA="@USE_XINERAMA@"
 export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"

set_soenv.in

@@ -1327,7 +1327,6 @@ if ("@WITH_VC_REDIST@" eq "TRUE") {
 ToFile( "WITH_VC_REDIST", "TRUE",  "e" );
 }
 ToFile( "PERL",              $PERL,              "e" );
-ToFile( "UPD",               $UPD,               "e" );
 ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
 ToFile( "SOLARVER",          $SOLARVER,          "e" );
 ToFile( "SOLARVERSION",      $SOLARVERSION,      "e" );

solenv/bin/linkoo

@@ -141,35 +141,10 @@ my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsql
 sub sniff_target($)
 {
     my $build_dir = shift;
-    my ($dirhandle, $fname);
     my ($target, $libver, $lang) = ( 'unxlngi6.pro', '680', 'en-US' ); # defaults
 
-    opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
-    while ($fname = readdir ($dirhandle)) {
-        if ($fname =~ /Host.sh$/) {
-            my $file;
-            open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
-            while (<$file>) {
-                /\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
-                if ($1 eq 'UPD') {
-                    $libver = $2;
-                }
-            }
-            close ($file);
-        } elsif ($fname =~ /host.mk$/) {
-            my $file;
-            open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";
-            while (<$file>) {
-                /\s*export\s*(\S+)\s*=\s*\"(\S+)\"/ || next;
-                if ($1 eq 'INPATH') {
-                    $target = $2;
-                }
-            }
-            close ($file);
-        }
-    }
-
-    closedir ($dirhandle);
+    chomp($target=`cat $build_dir/config_host.mk | grep INPATH= | sed -e 's/.*=//' | sed -e 's/"//g'`);
+    chomp($libver=`cat $build_dir/config_host.mk | grep UPD= | sed -e 's/.*=//' | sed -e 's/"//g'`);
 
     print "Sniffed target: $target, $libver\n";