[Libreoffice-commits] .: set_soenv.in

[François Tigeot]

 set_soenv.in |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit a74026d2893e1d9d07e2bfa75a12bf22cb834ed9
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sun May 22 10:29:41 2011 +0200

    Use a single shell source file for all NetBSD platforms
    
    Finish cleaning up INPATH and OUTPATH.

diff --git a/set_soenv.in b/set_soenv.in
index fc81fa6..de9ca67 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -232,7 +232,6 @@ elsif ( $platform =~ m/netbsd/ )
 #Set platform specific values:
    if ($platform =~ m/^i[3456]86/)
    {  print "Setting NetBSD x86 specific values... ";
-      $outfile        = "NetBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
@@ -241,7 +240,6 @@ elsif ( $platform =~ m/netbsd/ )
    }
    elsif ($platform =~ m/^x86_64/)
    {  print "Setting NetBSD x86-64 specific values... ";
-      $outfile        = "NetBSDX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
@@ -250,7 +248,6 @@ elsif ( $platform =~ m/netbsd/ )
    }
    elsif ($platform =~ m/^sparc/)
    {  print "Setting NetBSD Sparc specific values... ";
-      $outfile        = "NetBSDSparcEnv.Set.sh";
       $CPU            = "S";
       $CPUNAME        = "SPARC";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
@@ -259,7 +256,6 @@ elsif ( $platform =~ m/netbsd/ )
    }
    elsif ($platform =~ m/powerpc/)
    {  print "Setting NetBSD PPC specific values... ";
-      $outfile        = "NetBSDPPCEnv.Set.sh";
       $CPU            = "P";
       $CPUNAME        = "POWERPC";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
@@ -271,16 +267,16 @@ elsif ( $platform =~ m/netbsd/ )
      exit 1;
    }
    # General NetBSD settings:
-      $OUTPATH        = $OUTPATH."3";
       $COM            = "GCC";
       $COMPATH        = '@COMPATH@';
       $GUI            = "UNX";
       $GUIBASE        = "unx";
       $GVER           = "VCL";
-      $INPATH         = $OUTPATH.$PROEXT;
       $OS             = "NETBSD";
       $PATH_SEPERATOR = $ps;
       $OUTPATH        = "unxnbsd";
+      $outfile        = "NetBSDEnv.Set.sh";
+      $INPATH         = $OUTPATH.$PROEXT;
 }
 elsif ( $platform =~ m/kfreebsd/ )
 {