#99053# update

1 files changed, 37 insertions, 12 deletions

diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix
index 128b6ecb4bd4..b90daa47893e 100644
--- a/odk/setsdkenv_unix
+++ b/odk/setsdkenv_unix
@@ -38,6 +38,8 @@ then
     exit 0
 fi
 
+export SDK_HOME
+
 # Check installation path for the office.
 if [ -z "$OFFICE_HOME" ]
 then
@@ -45,6 +47,23 @@ then
     exit 0
 fi
 
+export OFFICE_HOME
+
+# Set library path.
+if [ -n "$LD_LIBRARY_PATH" ]
+then
+    # path not empty: append colon.
+    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:
+fi
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH$OFFICE_HOME/program
+
+export LD_LIBRARY_PATH
+
+# Set office program path.
+OFFICE_PROGRAM_PATH=$OFFICE_HOME/program
+
+export OFFICE_PROGRAM_PATH
+
 # Get the operating system.
 sd_platform=`uname -s`
 
@@ -52,49 +71,55 @@ sd_platform=`uname -s`
 case $sd_platform in
   SunOS)
     directoryname=solsparc
+    exampleout=SOLARISexample.out
     ;;
 
   Linux)
     directoryname=linux
+    exampleout=LINUXexample.out
     ;;
 esac
 
-# Set library path.
-LD_LIBRARY_PATH=$SDK_HOME/$directoryname/lib:$OFFICE_HOME/program:$LD_LIBRARY_PATH
-
-export LD_LIBRARY_PATH
-
-# Set office program path.
-OFFICE_PROGRAM_PATH=$OFFICE_HOME/program
-
-export OFFICE_PROGRAM_PATH
-
-
 # Add directory of the SDK tools to the path.
+#if [ -n "$PATH" ]
+#then
+    # Path not empty: append colon.
+#    PATH=$PATH:
+#fi
+
 PATH=$SDK_HOME/$directoryname/bin:$OFFICE_PROGRAM_PATH:$PATH
+LD_LIBRARY_PATH=$SDK_HOME/$directoryname/lib:$SDK_HOME/$exampleout/lib:$OFFICE_PROGRAM_PATH:$LD_LIBRARY_PATH
 
 # Add directory of the command make to the path, if necessary.
 if [ -n "$SDK_MAKE" ]
 then
     PATH=$SDK_MAKE:$PATH
+
+    export SDK_MAKE
 fi
 
 # Add directory of the C++ tools to the path, if necessary.
 if [ -n "$SDK_CPP_HOME" ]
 then
     PATH=$SDK_CPP_HOME:$PATH
+
+    export SDK_CPP_HOME
 fi
 
 # Add directory of the Java tools to the path, if necessary.
 if [ -n "$SDK_JAVA_HOME" ]
 then
     PATH=$SDK_JAVA_HOME/bin:$PATH
+
+    export SDK_JAVA_HOME
 fi
 
 # Add directory of the ANT tools to the path, if necessary.
 if [ -n "$SDK_ANT" ]
 then
-    PATH=$SDK_ANT/bin:PATH
+    PATH=$SDK_ANT/bin:$PATH
+
+    export SDK_ANT
 fi
 
 export PATH