diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-05-22 10:04:20 +0200 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-05-22 10:04:20 +0200 |
| commit | eaf6901170d8317916aeee1e225c200c5d68aaa1 (patch) | |
| tree | 7a5cbc2ccaae14e0a5be37cbe52886fc95e1e6a8 | |
| parent | 0a4009b2c4cf1ad78c1d237b3a5c37d750f07f92 (diff) | |
Use the same OUTPATH on all NetBSD architectures
| -rwxr-xr-x | set_soenv.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/set_soenv.in b/set_soenv.in index b86b4454d..fc81fa6bb 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/ ) { |