From 525cd7250d52f4440e37519a57d795923f083f5a Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Thu, 10 Feb 2011 11:44:53 +0000
Subject: [PATCH] Really do not sets the LD_LIBRARY_PATH when under Linux
 (uname -o).

---
 alliance/src/distrib/etc/alc_env.csh.in | 18 ++++++++++--------
 alliance/src/distrib/etc/alc_env.sh.in  | 14 ++++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/alliance/src/distrib/etc/alc_env.csh.in b/alliance/src/distrib/etc/alc_env.csh.in
index 98ca0439..509075cf 100644
--- a/alliance/src/distrib/etc/alc_env.csh.in
+++ b/alliance/src/distrib/etc/alc_env.csh.in
@@ -7,7 +7,7 @@
 #  Alliance CAD system environnement
 #  Usage (in C-shell) : > source alc_env.csh
 #  (C) 1997 Czo  -- <Olivier.Sirol@lip6.fr>
-#  $Id: alc_env.csh.in,v 1.11 2011/02/06 14:37:33 jpc Exp $
+#  $Id: alc_env.csh.in,v 1.12 2011/02/10 11:44:53 jpc Exp $
 #  Generated from alc_env.csh.in on @DATE@
 
 # $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will
@@ -83,19 +83,21 @@
      setenv PATH "${ALLIANCE_TOP}/bin"
    endif
   
-  # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
-   if ( $?LD_LIBRARY_PATH ) then
-     setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
-   else
-     setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:`manpath`"
+   if ( "`uname -o`" != "GNU/Linux" ) then
+    # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
+     if ( $?LD_LIBRARY_PATH ) then
+       setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
+     else
+       setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
+     endif
    endif
   
    if ( $?MANPATH ) then
      setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
    else
-     setenv MANPATH ":${ALLIANCE_TOP}/man"
+     setenv MANPATH ":${ALLIANCE_TOP}/man:`manpath`"
    endif
  endif
  
  # fixing *** ERROR *** : Variable MBK_SPI_MODEL not found.
- setenv MBK_SPI_MODEL     "${ALLIANCE_TOP}/etc/spimodel.cfg"
+ setenv MBK_SPI_MODEL     "${SYSCONF_TOP}/spimodel.cfg"
diff --git a/alliance/src/distrib/etc/alc_env.sh.in b/alliance/src/distrib/etc/alc_env.sh.in
index 0cd9b4c1..60e2723c 100644
--- a/alliance/src/distrib/etc/alc_env.sh.in
+++ b/alliance/src/distrib/etc/alc_env.sh.in
@@ -7,7 +7,7 @@
 #  Alliance CAD system environnement
 #  Usage (in Bourne-shell) : > . alc_env.sh
 #  (C) 1997 Czo  -- <Olivier.Sirol@lip6.fr>
-#  $Id: alc_env.sh.in,v 1.11 2011/02/10 11:33:46 jpc Exp $
+#  $Id: alc_env.sh.in,v 1.12 2011/02/10 11:44:53 jpc Exp $
 #  Generated from alc_env.sh.in on @DATE@
 
 # $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will
@@ -82,12 +82,14 @@
    export PATH
   
   # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
-   if [ -z "${LD_LIBRARY_PATH}" ]; then
-     LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
-   else
-     LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
+   if [ "`uname -o`" != "GNU/Linux" ]; then
+     if [ -z "${LD_LIBRARY_PATH}" ]; then
+       LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
+     else
+       LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
+     fi
+     export LD_LIBRARY_PATH
    fi
-   export LD_LIBRARY_PATH
   
    if [ -z "${MANPATH}" ]; then
      MANPATH=:$ALLIANCE_TOP/man:$(manpath)