gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-22 22:00:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidied

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@4941 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-09-24 19:15:22 +00:00
parent 79a1250c11
commit 6bb7061f89
3 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,7 +1,9 @@
Fri Sep 24 19:30:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* GNUstep.sh.in: Fix so that paths are set up correctly again.
* GNUstep.csh.in: ditto.
* GNUstep.csh.in: Fix so that paths are set up correctly again.
* GNUstep.sh.in: Fix so that paths are set up correctly again and
add checks to try to avoid duplicating information in paths.
* ld_lib_path.sh: Add checks to try to avoid duplication in path.
Mon Sep 20 9:40:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>

8
GNUstep.sh.in
View file

@ -78,13 +78,17 @@ for dir in $GNUSTEP_PATHPREFIX_LIST; do
temp_path=$temp_path$dir/Tools:
temp_path=$temp_path$dir/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:
done
PATH=$temp_path$PATH
IFS="$tmp_IFS"
if ( echo ${PATH}|fgrep -v "${temp_path}" >/dev/null ); then
PATH=$temp_path$PATH
fi
if [ -z "$MANPATH" ]; then
MANPATH=${GNUSTEP_SYSTEM_ROOT}/Library/man:/usr/local/man:/usr/man
else
MANPATH=${GNUSTEP_SYSTEM_ROOT}/Library/man:${MANPATH}
if ( echo ${MANPATH}|fgrep -v "${GNUSTEP_SYSTEM_ROOT}/Library/man" >/dev/null ); then
MANPATH=${GNUSTEP_SYSTEM_ROOT}/Library/man:${MANPATH}
fi
fi
. $GNUSTEP_MAKEFILES/ld_lib_path.sh

36
ld_lib_path.sh
View file

@ -5,10 +5,11 @@
# Return the name of the environment variable for the operating
# system that is used by the dynamic loader.
#
# Copyright (C) 1997 Free Software Foundation, Inc.
# Copyright (C) 1997,1999 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
# Author: Ovidiu Predescu <ovidiu@net-community.com>
# Rewrite: Richard Frith-Macdoanld <richard@brainstorm.co.uk>
# This file is part of the GNUstep Makefile Package.
#
# This library is free software; you can redistribute it and/or
@ -38,35 +39,36 @@ old_IFS="$IFS"
IFS="
"
lib_paths="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
if [ -n "$additional_library_paths" ]; then
for dir in $additional_library_paths; do
additional="${additional}${dir}:"
done
fi
lib_paths="${additional}${lib_paths}"
case "$host_os" in
*nextstep4*)
if [ -z "$DYLD_LIBRARY_PATH" ]; then
DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
DYLD_LIBRARY_PATH="$lib_paths"
else
DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part:$DYLD_LIBRARY_PATH"
if ( echo ${DYLD_LIBRARY_PATH}|fgrep -v "${lib_paths}" >/dev/null ); then
DYLD_LIBRARY_PATH="$lib_paths:$DYLD_LIBRARY_PATH"
fi
fi
if [ -n "$additional_library_paths" ]; then
for dir in $additional_library_paths; do
additional="${additional}${dir}:"
done
fi
DYLD_LIBRARY_PATH="${additional}${DYLD_LIBRARY_PATH}"
export DYLD_LIBRARY_PATH
;;
*)
if [ -z "$LD_LIBRARY_PATH" ]; then
LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
LD_LIBRARY_PATH="$lib_paths"
else
LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part:$LD_LIBRARY_PATH"
if ( echo ${LD_LIBRARY_PATH}|fgrep -v "${lib_paths}" >/dev/null ); then
LD_LIBRARY_PATH="$lib_paths:$LD_LIBRARY_PATH"
fi
fi
if [ -n "$additional_library_paths" ]; then
for dir in $additional_library_paths; do
additional="${additional}${dir}:"
done
fi
LD_LIBRARY_PATH="${additional}${LD_LIBRARY_PATH}"
export LD_LIBRARY_PATH;;
esac