Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chaned script and makefile to honor already existing LD_LIBRARY_PATH

Browse source 
environment variable
This commit is contained in:
maroy 2005-01-18 15:41:15 +00:00
parent 1660f54b6f
commit 548cd8cf20
18 changed files with 50 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
livesupport/modules/db/bin/autogen.sh
View file

@ -22,7 +22,7 @@
#
#
# Author : $Author: maroy $
# Version : $Revision: 1.3 $
# Version : $Revision: 1.4 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/bin/autogen.sh,v $
#-------------------------------------------------------------------------------
@ -89,7 +89,7 @@ autoconf -I ${tmpdir} -o ${configure} ${configure_ac}
export CPPFLAGS="-I$usrdir/include"
export LDFLAGS="-L$usrdir/lib"
export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig"
export LD_LIBRARY_PATH="$usrdir/lib"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib"
${configure} "$@" && echo

7
livesupport/modules/db/etc/Makefile.in
View file

@ -21,7 +21,7 @@
#
#
# Author : $Author: maroy $
# Version : $Revision: 1.6 $
# Version : $Revision: 1.7 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/Makefile.in,v $
#
# @configure_input@
@ -77,6 +77,8 @@ TEST_RUNNER = ${TMP_DIR}/testRunner
DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config
export LD_LIBRARY_PATH:=${LD_LIBRARY_PATH}:${USR_LIB_DIR}
#-------------------------------------------------------------------------------
# Configuration parameters
@ -136,8 +138,7 @@ distclean: clean docclean
${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te*
check: all ${TEST_RUNNER}
LD_LIBRARY_PATH=${USR_LIB_DIR} ${TEST_RUNNER} \
-o ${TEST_RESULTS} -s ${TEST_XSLT}
${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT}
#-------------------------------------------------------------------------------