mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Set INFOPATH so that our info files are found at runtime; minor tidyups in GNUstep shell setup/reset scripts
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24327 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
71169c1f0c
commit
29756933ff
4 changed files with 70 additions and 8 deletions
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2007-01-09 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* GNUstep.sh.in: Update some internal names to make equivalent
|
||||
code in different sections more similar. Added a ':' at the end
|
||||
of INFOPATH.
|
||||
* GNUstep.csh.in: Similar changes.
|
||||
* GNUstep-reset.sh: Swapped order of resets of some variables to
|
||||
conform to comments.
|
||||
|
||||
2007-01-09 Matt Rice <ratmice@gmail.com>
|
||||
|
||||
* GNUstep.sh.in: Set INFOPATH so that info files created and
|
||||
installed by gnustep-make in xxx/Library/info can be found by info
|
||||
documentation readers.
|
||||
* GNUstep.csh.in: Same change.
|
||||
* GNUstep-reset.sh: Reset INFOPATH.
|
||||
|
||||
2007-01-07 Matt Rice <ratmice@gmail.com>,
|
||||
Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -81,8 +81,9 @@ function reset_path
|
|||
fi
|
||||
}
|
||||
|
||||
reset_path CLASSPATH /Library/Libraries/Java
|
||||
reset_path INFOPATH Library/Documentation/info
|
||||
reset_path GUILE_LOAD_PATH /Library/Libraries/Guile
|
||||
reset_path CLASSPATH /Library/Libraries/Java
|
||||
reset_path LD_LIBRARY_PATH /Library/Libraries
|
||||
reset_path DYLD_LIBRARY_PATH /Library/Libraries
|
||||
reset_path DYLD_FRAMEWORK_PATH /Library/Frameworks
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ unset gnustep_class_path
|
|||
|
||||
set gnustep_guile_path="${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Libraries/Guile"
|
||||
|
||||
if ( $?GUILE_LOAD_PATH == 0 ) then
|
||||
if ( ${?GUILE_LOAD_PATH} ) then
|
||||
setenv GUILE_LOAD_PATH "${gnustep_guile_path}"
|
||||
else if ( { (echo "${GUILE_LOAD_PATH}" | fgrep -v "${gnustep_guile_path}" >/dev/null) } ) then
|
||||
setenv GUILE_LOAD_PATH "${gnustep_guile_path}:${GUILE_LOAD_PATH}"
|
||||
|
|
@ -217,6 +217,16 @@ endif
|
|||
|
||||
unset gnustep_guile_path
|
||||
|
||||
set gnustep_info_path="${GNUSTEP_USER_ROOT}/Library/Documentation/info:${GNUSTEP_LOCAL_ROOT}/Library/Documentation/info:${GNUSTEP_NETWORK_ROOT}/Library/Documentation/info:${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/info"
|
||||
|
||||
if ( ! ${?INFOPATH} ) then
|
||||
setenv INFOPATH "${gnustep_info_path}:"
|
||||
else if ( { (echo "${INFOPATH}" | fgrep -v "${gnustep_info_path}" >/dev/null) } ) then
|
||||
setenv INFOPATH "${INFOPATH}:${gnustep_info_path}:"
|
||||
endif
|
||||
|
||||
unset gnustep_info_path
|
||||
|
||||
#
|
||||
# Perform any user initialization
|
||||
#
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ fi
|
|||
#
|
||||
# Add path to Tools to PATH
|
||||
#
|
||||
tmp_IFS="$IFS"
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
temp_path=
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
|
@ -284,8 +284,8 @@ for dir in $GNUSTEP_PATHLIST; do
|
|||
unset path_fragment
|
||||
|
||||
done
|
||||
IFS="$tmp_IFS"
|
||||
unset tmp_IFS
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
unset dir
|
||||
if [ -z "$PATH" ]; then
|
||||
PATH="$temp_path"
|
||||
|
|
@ -299,7 +299,7 @@ export PATH
|
|||
|
||||
. $GNUSTEP_MAKEFILES/ld_lib_path.sh
|
||||
|
||||
tmp_IFS="$IFS"
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
gnustep_class_path=
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
|
@ -311,8 +311,8 @@ for dir in $GNUSTEP_PATHLIST; do
|
|||
fi
|
||||
|
||||
done
|
||||
IFS="$tmp_IFS"
|
||||
unset tmp_IFS
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
unset dir
|
||||
|
||||
if [ -z "$CLASSPATH" ]; then
|
||||
|
|
@ -356,6 +356,40 @@ export GUILE_LOAD_PATH
|
|||
unset guile_paths
|
||||
|
||||
|
||||
#
|
||||
# Make sure info files, that we install by default into
|
||||
# xxx/Library/Documentation/info, are found by the info browsing
|
||||
# programs. To get this effect, we add those paths to INFOPATH.
|
||||
#
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
gnustep_info_path=
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
||||
if [ -z "$gnustep_info_path" ]; then
|
||||
gnustep_info_path="$dir/Library/Documentation/info"
|
||||
else
|
||||
gnustep_info_path="$gnustep_class_path:$dir/Library/Documentation/info"
|
||||
fi
|
||||
|
||||
done
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
unset dir
|
||||
|
||||
if [ -z "$INFOPATH" ]; then
|
||||
# The ':' at the end means to use the built-in paths after searching
|
||||
# the INFOPATH we provide.
|
||||
INFOPATH="${gnustep_info_path}:"
|
||||
else
|
||||
if ( echo ${INFOPATH}| grep -v "${gnustep_info_path}" >/dev/null ); then
|
||||
INFOPATH="$INFOPATH:${gnustep_info_path}:"
|
||||
fi
|
||||
fi
|
||||
|
||||
unset gnustep_info_path
|
||||
export INFOPATH
|
||||
|
||||
#
|
||||
# Perform any user initialization
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in a new issue