[Libreoffice-commits] .: set_soenv.in

[François Tigeot]

 set_soenv.in |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit eaf6901170d8317916aeee1e225c200c5d68aaa1
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sun May 22 10:04:20 2011 +0200

    Use the same OUTPATH on all NetBSD architectures

diff --git a/set_soenv.in b/set_soenv.in
index b86b445..fc81fa6 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -235,7 +235,6 @@ elsif ( $platform =~ m/netbsd/ )
       $outfile        = "NetBSDX86Env.Set.sh";
       $CPU            = "I";
       $CPUNAME        = "INTEL";
-      $OUTPATH        = "unxbsdi";
       $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";
@@ -245,7 +244,6 @@ elsif ( $platform =~ m/netbsd/ )
       $outfile        = "NetBSDX86-64Env.Set.sh";
       $CPU            = "X";
       $CPUNAME        = "X86_64";
-      $OUTPATH        = "unxbsdx";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
@@ -255,7 +253,6 @@ elsif ( $platform =~ m/netbsd/ )
       $outfile        = "NetBSDSparcEnv.Set.sh";
       $CPU            = "S";
       $CPUNAME        = "SPARC";
-      $OUTPATH        = "unxbsds";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
@@ -265,7 +262,6 @@ elsif ( $platform =~ m/netbsd/ )
       $outfile        = "NetBSDPPCEnv.Set.sh";
       $CPU            = "P";
       $CPUNAME        = "POWERPC";
-      $OUTPATH        = "unxbsdppc";
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
@@ -284,6 +280,7 @@ elsif ( $platform =~ m/netbsd/ )
       $INPATH         = $OUTPATH.$PROEXT;
       $OS             = "NETBSD";
       $PATH_SEPERATOR = $ps;
+      $OUTPATH        = "unxnbsd";
 }
 elsif ( $platform =~ m/kfreebsd/ )
 {