2 files changed, 18 insertions, 16 deletions

diff --git a/config_host.mk.in b/config_host.mk.in
index 2705eb42f6b7..ebd3d4635401 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -5,6 +5,8 @@
 export SRC_ROOT="@SRC_ROOT@"
 
 export ABOUT_BITMAP="@ABOUT_BITMAP@"
+export ANCIENT_BISON="@ANCIENT_BISON@"
+export AR="@AR@"
 export BSH_JAR="@BSH_JAR@"
 export CAIRO_CFLAGS="@CAIRO_CFLAGS@"
 export CAIRO_LIBS="@CAIRO_LIBS@"
@@ -22,6 +24,7 @@ export CPU="@CPU@"
 export CPUNAME="@CPUNAME@"
 export CPUNAME_FOR_BUILD="@CPUNAME_FOR_BUILD@"
 export CPU_FOR_BUILD="@CPU_FOR_BUILD@"
+export CROSS_COMPILING="@CROSS_COMPILING@"
 export CURL_CFLAGS="@CURL_CFLAGS@"
 export CURL_LIBS="@CURL_LIBS@"
 export DBUSMENUGTK_CFLAGS="@DBUSMENUGTK_CFLAGS@"
@@ -29,6 +32,8 @@ export DBUSMENUGTK_LIBS="@DBUSMENUGTK_LIBS@"
 export DBUS_CFLAGS="@DBUS_CFLAGS@"
 export DBUS_LIBS="@DBUS_LIBS@"
 export DISABLE_NEON="@DISABLE_NEON@"
+export DLLTOOL="@DLLTOOL@"
+export DPKG="@DPKG@"
 export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
 export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@"
 export ENABLE_DBUS="@ENABLE_DBUS@"
@@ -71,13 +76,18 @@ export ENABLE_SYSTRAY_GTK="@ENABLE_SYSTRAY_GTK@"
 export ENABLE_UGLY="@ENABLE_UGLY@"
 export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
 export ENABLE_ZENITY="@ENABLE_ZENITY@"
+export EPM="@EPM@"
 export FLUTE_JAR="@FLUTE_JAR@"
 export FONTCONFIG_CFLAGS="@FONTCONFIG_CFLAGS@"
 export FONTCONFIG_LIBS="@FONTCONFIG_LIBS@"
 export FREETYPE_CFLAGS="@FREETYPE_CFLAGS@"
 export FREETYPE_LIBS="@FREETYPE_LIBS@"
+export GNUCOPY="@GNUCP@"
+export GNUMAKE="@GNUMAKE@"
+export GNUTAR="@GNUTAR@"
 export GOBJECT_CFLAGS="@GOBJECT_CFLAGS@"
 export GOBJECT_LIBS="@GOBJECT_LIBS@"
+export GPERF="@GPERF@"
 export GRAPHITE_CFLAGS="@GRAPHITE_CFLAGS@"
 export GRAPHITE_LIBS="@GRAPHITE_LIBS@"
 export GSTREAMER_CFLAGS="@GSTREAMER_CFLAGS@"
@@ -135,8 +145,10 @@ export MYTHES_CFLAGS="@MYTHES_CFLAGS@"
 export MYTHES_LIBS="@MYTHES_LIBS@"
 export NEON_CFLAGS="@NEON_CFLAGS@"
 export NEON_LIBS="@NEON_LIBS@"
+export NM="@NM@"
 export NSS_CFLAGS="@NSS_CFLAGS@"
 export NSS_LIBS="@NSS_LIBS@"
+export OBJDUMP="@OBJDUMP@"
 export OOO_JUNIT_JAR="@OOO_JUNIT_JAR@"
 export OPENSSL_CFLAGS="@OPENSSL_CFLAGS@"
 export OPENSSL_LIBS="@OPENSSL_LIBS@"
@@ -145,14 +157,18 @@ export OS_FOR_BUILD="@OS_FOR_BUILD@"
 export OUTPATH="@OUTPATH@"
 export OUTPATH_FOR_BUILD="@OUTPATH_FOR_BUILD@"
 export PATH_SEPERATOR="@P_SEP@"
+export PKGMK="@PKGMK@"
+export PKG_CONFIG="@PKG_CONFIG@"
 export POPPLER_CFLAGS="@POPPLER_CFLAGS@"
 export POPPLER_LIBS="@POPPLER_LIBS@"
 export PTHREAD_CFLAGS="@PTHREAD_CFLAGS@"
 export PTHREAD_LIBS="@PTHREAD_LIBS@"
 export PYTHON_CFLAGS="@PYTHON_CFLAGS@"
 export PYTHON_LIBS="@PYTHON_LIBS@"
+export RANLIB="@RANLIB@"
 export REDLAND_CFLAGS="@REDLAND_CFLAGS@"
 export REDLAND_LIBS="@REDLAND_LIBS@"
+export RPM="@RPM@"
 export SAC_JAR="@SAC_JAR@"
 export SAL_ENABLE_FILE_LOCKING="1"
 export SAMPLEICC_CFLAGS="@SAMPLEICC_CFLAGS@"
@@ -165,6 +181,7 @@ export SIZEOF_LONG="@SIZEOF_LONG@"
 export SIZEOF_LONGLONG="@SIZEOF_LONGLONG@"
 export SIZEOF_POINTER="@SIZEOF_POINTER@"
 export SIZEOF_SHORT="@SIZEOF_SHORT@"
+export STRIP="@STRIP@"
 export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@"
 export SYSTEM_BOOST="@SYSTEM_BOOST@"
 export SYSTEM_BSH="@SYSTEM_BSH@"
@@ -228,6 +245,7 @@ export SYSTEM_ZLIB="@SYSTEM_ZLIB@"
 export VALGRIND_CFLAGS="@VALGRIND_CFLAGS@"
 export VISIO_CFLAGS="@VISIO_CFLAGS@"
 export VISIO_LIBS="@VISIO_LIBS@"
+export WINDRES="@WINDRES@"
 export WPD_CFLAGS="@WPD_CFLAGS@"
 export WPD_LIBS="@WPD_LIBS@"
 export WPG_CFLAGS="@WPG_CFLAGS@"
diff --git a/set_soenv.in b/set_soenv.in
index 488eaffe7104..f8853e81b199 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1371,12 +1371,6 @@ if ("@WITH_VC_REDIST@" eq "TRUE") {
 ToFile( "WITH_VC_REDIST", "TRUE",  "e" );
 }
 ToFile( "PERL",              $PERL,              "e" );
-ToFile( "RPM",               "@RPM@",            "e" );
-ToFile( "DPKG",              "@DPKG@",           "e" );
-ToFile( "PKGMK",             "@PKGMK@",          "e" );
-ToFile( "GNUMAKE",           "@GNUMAKE@",        "e" );
-ToFile( "GNUTAR",            "@GNUTAR@",         "e" );
-ToFile( "ANCIENT_BISON",     "@ANCIENT_BISON@",  "e" );
 ToFile( "UPD",               $UPD,               "e" );
 ToFile( "WORK_STAMP",        $WORK_STAMP,        "e" );
 ToFile( "SOLARVER",          $SOLARVER,          "e" );
@@ -1433,15 +1427,6 @@ else
 {  $SYSBASE = '';
 }
 ToFile( "SYSBASE",           "$SYSBASE",         "e" );
-ToFile( "CROSS_COMPILING",   "@CROSS_COMPILING@","e" );
-ToFile( "AR",                "@AR@",             "e" );
-ToFile( "DLLTOOL",           "@DLLTOOL@",        "e" );
-ToFile( "NM",                "@NM@",             "e" );
-ToFile( "OBJDUMP",           "@OBJDUMP@",        "e" );
-ToFile( "PKG_CONFIG",        "@PKG_CONFIG@",     "e" );
-ToFile( "RANLIB",            "@RANLIB@",         "e" );
-ToFile( "STRIP",             "@STRIP@",          "e" );
-ToFile( "WINDRES",           "@WINDRES@",        "e" );
 ToFile( "BUILD_PLATFORM",    "@build@",          "e" );
 ToFile( "HOST_PLATFORM",     "@host@",           "e" );
 if ( '@CROSS_COMPILING@' eq 'YES' )
@@ -1539,7 +1524,6 @@ ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
 if ( '@ENABLE_RPATH@' eq "no" ) {
   ToFile( "LINKFLAGSRUNPATH",'',                   "e" );
 }
-ToFile( "EPM",               "@EPM@",              "e" );
 ToFile( "EPM_FLAGS",         $EPM_FLAGS,           "e" );
 ToFile( "BUILD_EPM",         "@BUILD_EPM@",        "e" );
 ToFile( "GPERF",             "@GPERF@",            "e" );