[Libreoffice-commits] .: set_soenv.in

[François Tigeot]

 set_soenv.in |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 935d34152a10e19d33dcf9017add3be89e5b9616
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Mon Apr 4 21:27:10 2011 +0200

    Use the same $outfile and $OUTPATH on all DragonFly architectures.

diff --git a/set_soenv.in b/set_soenv.in
index 1e45bed..0ebe5d9 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -796,20 +796,16 @@ elsif ( $platform =~ m/dragonfly/ )
 {
    if ($platform =~ m/^i386/)
    {  print "Setting DragonFly i386 specific values... ";
-      $outfile        = "DragonFlyX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
-      $OUTPATH        = "unxdflyi";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting DragonFly x86-64 specific values... ";
-      $outfile        = "DragonFlyX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
-      $OUTPATH        = "unxdflyx";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
@@ -820,16 +816,17 @@ elsif ( $platform =~ m/dragonfly/ )
    }
    # General DragonFly settings:
       $CVER           = "C341";
-      $OUTPATH        = $OUTPATH."3";
       $BIG_SVX        = "TRUE";
       $COM            = "GCC";
       $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
       $GVER           = "VCL";
-      $INPATH         = $OUTPATH.$PROEXT;
       $OS             = "DRAGONFLY";
       $PATH_SEPERATOR = $ps;
+      $OUTPATH        = "unxdfly";
+      $outfile        = "DragonFlyEnv.Set.sh";
+      $INPATH         = $OUTPATH.$PROEXT;
 }
 elsif ( $platform =~ m/aix/ )
 {