From 8c592206178f72f852cec3f54fba501f2030b154 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 31 Oct 2013 13:04:44 +0100
Subject: installer: replace usage of OUTDIR

Change-Id: I82a87bdde9751efbdcfb4da5f89ba10ac17b427b
---
 solenv/bin/modules/installer/control.pm           |  4 ++--
 solenv/bin/modules/installer/windows/admin.pm     |  4 ++--
 solenv/bin/modules/installer/windows/msiglobal.pm | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 573f731246f6..deea124b817e 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -73,7 +73,7 @@ sub check_system_path
     if ($ENV{'CROSS_COMPILING'} eq 'YES')
     {
         # we build our own msi* etc. tools when cross-compiling
-        $ENV{'PATH'} .= $installer::globals::pathseparator . $ENV{'OUTDIR_FOR_BUILD'} . '/bin';
+        $ENV{'PATH'} .= $installer::globals::pathseparator . $ENV{'WORKDIR_FOR_BUILD'} . '/LinkTarget/Executable';
     }
 
     my $onefile;
@@ -169,7 +169,7 @@ sub get_makecab_version
     my $systemcall = "makecab.exe |";
     if ( $installer::globals::isunix )
     {
-        $systemcall = "$ENV{'OUTDIR_FOR_BUILD'}/bin/makecab.exe |";
+        $systemcall = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/makecab.exe |";
     }
     my @makecaboutput = ();
 
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index e5b199d4743f..6fb18583110f 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -102,7 +102,7 @@ sub extract_tables_from_pcpfile
     my $msidb = "msidb.exe";    # Has to be in the path
     if ( $installer::globals::isunix )
     {
-        $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe";
+        $msidb = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msidb.exe";
     }
     my $infoline = "";
     my $systemcall = "";
@@ -407,7 +407,7 @@ sub write_sis_info
     my $msiinfo = "msiinfo.exe";    # Has to be in the path
     if ( $installer::globals::isunix )
     {
-        $msiinfo = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe";
+        $msiinfo = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msiinfo.exe";
     }
     my $infoline = "";
     my $systemcall = "";
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 492b4a7c13c3..18366eb3a495 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -251,7 +251,7 @@ sub generate_cab_file_list
             my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
             if ( $installer::globals::isunix )
             {
-                $oneline = "$ENV{'OUTDIR_FOR_BUILD'}/bin/makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
+                $oneline = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
             }
 
             push(@cabfilelist, $oneline);
@@ -331,7 +331,7 @@ sub generate_cab_file_list
             my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
             if ( $installer::globals::isunix )
             {
-                $oneline = "$ENV{'OUTDIR_FOR_BUILD'}/bin/makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
+                $oneline = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . "\n";
             }
 
             push(@cabfilelist, $oneline);
@@ -460,7 +460,7 @@ sub create_msi_database
     my $msidb = "msidb.exe";    # Has to be in the path
     if ( $installer::globals::isunix )
     {
-        $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe";
+        $msidb = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msidb.exe";
     }
     my $extraslash = "";        # Has to be set for non-ActiveState perl
 
@@ -615,7 +615,7 @@ sub write_summary_into_msi_database
     my $msiinfo = "msiinfo.exe";    # Has to be in the path
     if ( $installer::globals::isunix )
     {
-        $msiinfo = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe";
+        $msiinfo = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msiinfo.exe";
     }
 
     my $msiversion = get_msiversion_for_sis();
@@ -1151,7 +1151,7 @@ sub include_cabs_into_msi
     my $msidb = "msidb.exe";    # Has to be in the path
     if ( $installer::globals::isunix )
     {
-        $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe";
+        $msidb = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msidb.exe";
     }
     my $extraslash = "";        # Has to be set for non-ActiveState perl
 
-- 
cgit