3 files changed, 8 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 4ea85b68a375..c1dd768b797e 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1702,7 +1702,7 @@ sub prepare_packages
     if ( $installer::globals::isrpmbuild )
     {
         set_topdir_in_specfile($changefile, $filename, $newepmdir);
-        set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::unpackpath" . "/bin");
+        set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::workpath" . "/bin");
         set_packager_in_specfile($changefile);
         if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); }
         set_license_in_specfile($changefile, $variableshashref);
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 7cd6e92b8e48..197b1cad33a3 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -58,6 +58,8 @@ BEGIN
     $ismacbuild = 0;
     $ismacdmgbuild = 0;
     $unpackpath = "";
+    $workpath = ""; # installation working dir; some helper scripts are
+    # placed here by gbuild
     $idttemplatepath = "";
     $idtlanguagepath = "";
     $buildid = "Not set";
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 2a98dd84639d..eef8d3ecffb3 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -341,6 +341,11 @@ sub setglobalvariables
         $installer::globals::unpackpath = cwd();
     }
 
+    if ($installer::globals::workpath eq "")  # workpath not set
+    {
+        $installer::globals::workpath = cwd();
+    }
+
     if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
 
     if (!($installer::globals::unpackpath eq ""))