[jboss-cvs] JBossAS SVN: r93683 - branches/Branch_5_x/main/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2009-09-18 07:24:08 -0400 (Fri, 18 Sep 2009)
New Revision: 93683

Modified:
   branches/Branch_5_x/main/src/bin/run.sh
Log:
Fix JBAS-7239 by merging with the EAP 5.0 branch. This is stage 2 of the fix adding the community native directoy layout check

Modified: branches/Branch_5_x/main/src/bin/run.sh
===================================================================
--- branches/Branch_5_x/main/src/bin/run.sh	2009-09-18 11:22:31 UTC (rev 93682)
+++ branches/Branch_5_x/main/src/bin/run.sh	2009-09-18 11:24:08 UTC (rev 93683)
@@ -175,6 +175,10 @@
     JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../native" && pwd`
 elif [ -d "$JBOSS_HOME/native/lib64" ]; then
     JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
+elif [ -d "$JBOSS_HOME/native/bin" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd`
+elif [ -d "$JBOSS_HOME/bin/native" ]; then
+    JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/bin/native" && pwd`
 fi
 if [ -d "$JBOSS_NATIVE_DIR" ]; then
     if $cygwin; then