gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-05-30 17:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reapply patch

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@19481 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-06-07 14:54:18 +00:00
parent edb71df3e6
commit 4dac07b5be
3 changed files with 21 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,7 +1,3 @@
2004-06-06 Adam Fedor <fedor@gnu.org>
* ld_lib_path.[c]sh: Revert last.
2004-06-05 Adam Fedor <fedor@gnu.org>
* ld_lib_path.[c]sh: Allow seting of GNUstep framework location on

31
ld_lib_path.csh
View file

@ -84,25 +84,22 @@ switch ( "${host_os}" )
endif
endif
if ( ( "${LIBRARY_COMBO}" == "apple-apple-apple" ) \
|| ( "${LIBRARY_COMBO}" == "apple") ) then
unset additional
unset additional
if ( $?DYLD_FRAMEWORK_PATH == 0 ) then
setenv DYLD_FRAMEWORK_PATH "${fw_paths}"
else if ( { (echo "${DYLD_FRAMEWORK_PATH}" | fgrep -v "${fw_paths}" >/dev/null) } ) then
setenv DYLD_FRAMEWORK_PATH "${fw_paths}:${DYLD_FRAMEWORK_PATH}"
endif
if ( $?additional_framework_paths == 1) then
foreach dir (${additional_framework_paths})
set additional="${additional}${dir}:"
end
endif
if ( $?DYLD_FRAMEWORK_PATH == 0 ) then
setenv DYLD_FRAMEWORK_PATH "${fw_paths}"
else if ( { (echo "${DYLD_FRAMEWORK_PATH}" | fgrep -v "${fw_paths}" >/dev/null) } ) then
setenv DYLD_FRAMEWORK_PATH "${fw_paths}:${DYLD_FRAMEWORK_PATH}"
endif
if ( $?additional_framework_paths == 1) then
foreach dir (${additional_framework_paths})
set additional="${additional}${dir}:"
end
endif
if ( "${?additional}" == "1" ) then
if ( { (echo "${DYLD_FRAMEWORK_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
setenv DYLD_FRAMEWORK_PATH="${additional}${DYLD_FRAMEWORK_PATH}"
endif
if ( "${?additional}" == "1" ) then
if ( { (echo "${DYLD_FRAMEWORK_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
setenv DYLD_FRAMEWORK_PATH="${additional}${DYLD_FRAMEWORK_PATH}"
endif
endif
breaksw

18
ld_lib_path.sh
View file

@ -131,19 +131,15 @@ case "$host_os" in
fi
fi
export DYLD_LIBRARY_PATH
if [ "$LIBRARY_COMBO" = "apple-apple-apple" -o \
"$LIBRARY_COMBO" = "apple" ]; then
if [ -z "$DYLD_FRAMEWORK_PATH" ]; then
DYLD_FRAMEWORK_PATH="$fw_paths"
else
if ( echo ${DYLD_FRAMEWORK_PATH}|
fgrep -v "${fw_paths}" >/dev/null ); then
DYLD_FRAMEWORK_PATH="$fw_paths:$DYLD_FRAMEWORK_PATH"
fi
if [ -z "$DYLD_FRAMEWORK_PATH" ]; then
DYLD_FRAMEWORK_PATH="$fw_paths"
else
if ( echo ${DYLD_FRAMEWORK_PATH}|
fgrep -v "${fw_paths}" >/dev/null ); then
DYLD_FRAMEWORK_PATH="$fw_paths:$DYLD_FRAMEWORK_PATH"
fi
export DYLD_FRAMEWORK_PATH
fi
;;
export DYLD_FRAMEWORK_PATH;;
*hpux*)
if [ -z "$SHLIB_PATH" ]; then