Really do not sets the LD_LIBRARY_PATH when under Linux (uname -o).

This commit is contained in:
Jean-Paul Chaput 2011-02-10 11:44:53 +00:00
parent 830798cce8
commit 525cd7250d
2 changed files with 18 additions and 14 deletions

View File

@ -7,7 +7,7 @@
# Alliance CAD system environnement # Alliance CAD system environnement
# Usage (in C-shell) : > source alc_env.csh # Usage (in C-shell) : > source alc_env.csh
# (C) 1997 Czo -- <Olivier.Sirol@lip6.fr> # (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@ # Generated from alc_env.csh.in on @DATE@
# $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will # $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will
@ -83,19 +83,21 @@
setenv PATH "${ALLIANCE_TOP}/bin" setenv PATH "${ALLIANCE_TOP}/bin"
endif endif
# Only needed on Solaris (included in /etc/ld.so.conf under Linux). if ( "`uname -o`" != "GNU/Linux" ) then
if ( $?LD_LIBRARY_PATH ) then # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib" if ( $?LD_LIBRARY_PATH ) then
else setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${ALLIANCE_TOP}/lib"
setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib:`manpath`" else
setenv LD_LIBRARY_PATH "${ALLIANCE_TOP}/lib"
endif
endif endif
if ( $?MANPATH ) then if ( $?MANPATH ) then
setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man" setenv MANPATH "${MANPATH}:${ALLIANCE_TOP}/man"
else else
setenv MANPATH ":${ALLIANCE_TOP}/man" setenv MANPATH ":${ALLIANCE_TOP}/man:`manpath`"
endif endif
endif endif
# fixing *** ERROR *** : Variable MBK_SPI_MODEL not found. # 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"

View File

@ -7,7 +7,7 @@
# Alliance CAD system environnement # Alliance CAD system environnement
# Usage (in Bourne-shell) : > . alc_env.sh # Usage (in Bourne-shell) : > . alc_env.sh
# (C) 1997 Czo -- <Olivier.Sirol@lip6.fr> # (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@ # Generated from alc_env.sh.in on @DATE@
# $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will # $ALLIANCE_OS and $ALLIANCE_TOP are the only variables you will
@ -82,12 +82,14 @@
export PATH export PATH
# Only needed on Solaris (included in /etc/ld.so.conf under Linux). # Only needed on Solaris (included in /etc/ld.so.conf under Linux).
if [ -z "${LD_LIBRARY_PATH}" ]; then if [ "`uname -o`" != "GNU/Linux" ]; then
LD_LIBRARY_PATH=$ALLIANCE_TOP/lib if [ -z "${LD_LIBRARY_PATH}" ]; then
else LD_LIBRARY_PATH=$ALLIANCE_TOP/lib
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib else
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ALLIANCE_TOP/lib
fi
export LD_LIBRARY_PATH
fi fi
export LD_LIBRARY_PATH
if [ -z "${MANPATH}" ]; then if [ -z "${MANPATH}" ]; then
MANPATH=:$ALLIANCE_TOP/man:$(manpath) MANPATH=:$ALLIANCE_TOP/man:$(manpath)