[Libreoffice-commits] .: set_soenv.in

[François Tigeot]

 set_soenv.in |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f2f9e520ba51e6d586f4f9ad774d090b212da192
Author: Baptiste Daroussin <bapt at FreeBSD.org>
Date:   Mon Sep 19 13:57:23 2011 +0200

    Fix soenv for FreeBSD

diff --git a/set_soenv.in b/set_soenv.in
index 5ffd45f..947a0c8 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -316,13 +316,13 @@ elsif ( $platform =~ m/freebsd/ )
       $OS             = "FREEBSD";
       $PATH_SEPERATOR = $ps;
       $OSVERSION      = '@OSVERSION@';
+      $OUTPATH        = 'unxfbsd';
+      $oldoutfile     = 'FreeBSDEnv.Set.sh';
    if ($platform =~ m/^(amd64|x86_64)/)
    {  my ( $JAVA_OS );
       print "Setting FreeBSD AMD64 specific values... ";
-      $oldoutfile     = "FreeBSDAMDEnv.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
-      $OUTPATH        = "unxfbsdx";
       $JAVA_OS        = '@JAVA_HOME@';
       $JAVA_OS        =~ s/.*\///;
       if ($JAVA_OS =~ m/^linux/)
@@ -338,7 +338,6 @@ elsif ( $platform =~ m/freebsd/ )
    }
    elsif ($platform =~ m/^i386/)
    {  print "Setting FreeBSD x86 specific values... ";
-      $oldoutfile     = "FreeBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $OUTPATH        = "unxfbsdi";