mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Added GNUSTEP_xxx_ADMIN_APPS and GNUSTEP_xxx_ADMIN_TOOLS
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24614 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
cf9fb9bdfe
commit
bc40e45feb
18 changed files with 347 additions and 52 deletions
30
ChangeLog
30
ChangeLog
|
|
@ -1,3 +1,33 @@
|
|||
2007-02-16 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Added GNUSTEP_ADMIN_APPS and GNUSTEP_ADMIN_TOOLS.
|
||||
* common.make: Added GNUSTEP_ADMIN_APPS and GNUSTEP_ADMIN_TOOLS.
|
||||
* filesystem.sh.in: Added GNUSTEP_*_ADMIN_APPS and
|
||||
GNUSTEP_*_ADMIN_TOOLS.
|
||||
* filesystem.csh.in: Same changes.
|
||||
* filesystem.make.in: Same changes.
|
||||
* GNUstep.config.in: Same changes.
|
||||
* configure.ac: Same changes.
|
||||
* configure: Regenerated.
|
||||
|
||||
* create_domain_dir_tree.sh: Create the Applications/Admin and
|
||||
Tools/Admin/GNUSTEP_TARGET_LDIR directories.
|
||||
|
||||
* GNUstep.sh.in: Add each GNUSTEP_*_ADMIN_TOOLS path to PATH, but
|
||||
only if we are administrators. Unset/export GNUSTEP_*_ADMIN_APPS
|
||||
and GNUSTEP_*_ADMIN_TOOLS dirs at the end.
|
||||
* GNUstep.csh.in: Same changes.
|
||||
* GNUstep-reset.sh: Unset GNUSTEP_*_ADMIN_APPS and
|
||||
GNUSTEP_*_ADMIN_TOOLS variables.
|
||||
* openapp.in: Search for the application in the Admin Apps
|
||||
directories as well, but only if we are an Administrator.
|
||||
|
||||
* FilesystemLayouts/gnustep: Added GNUSTEP_*_ADMIN_APPS and
|
||||
GNUSTEP_*_ADMIN_TOOLS.
|
||||
* FilesystemLayouts/fhs: Same changes.
|
||||
* FilesystemLayouts/fhs-system: Same changes.
|
||||
* FilesystemLayouts/windows: Same changes.
|
||||
|
||||
2007-02-16 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Instance/Documentation/latex.make: Revert adding extension.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@ GNUSTEP_DEFAULT_PREFIX=/usr/local
|
|||
GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles
|
||||
|
||||
GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_SYSTEM_TOOLS=/bin
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
|
||||
GNUSTEP_SYSTEM_HEADERS=/include
|
||||
GNUSTEP_SYSTEM_LIBRARIES=/lib
|
||||
|
|
@ -34,7 +36,9 @@ GNUSTEP_SYSTEM_DOCUMENTATION_MAN=/man
|
|||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO=/info
|
||||
|
||||
GNUSTEP_NETWORK_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_NETWORK_TOOLS=/bin
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_NETWORK_LIBRARY=/lib/GNUstep
|
||||
GNUSTEP_NETWORK_HEADERS=/include
|
||||
GNUSTEP_NETWORK_LIBRARIES=/lib
|
||||
|
|
@ -43,7 +47,9 @@ GNUSTEP_NETWORK_DOCUMENTATION_MAN=/man
|
|||
GNUSTEP_NETWORK_DOCUMENTATION_INFO=/info
|
||||
|
||||
GNUSTEP_LOCAL_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_LOCAL_TOOLS=/bin
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_LOCAL_LIBRARY=/lib/GNUstep
|
||||
GNUSTEP_LOCAL_HEADERS=/include
|
||||
GNUSTEP_LOCAL_LIBRARIES=/lib
|
||||
|
|
@ -52,7 +58,9 @@ GNUSTEP_LOCAL_DOCUMENTATION_MAN=/man
|
|||
GNUSTEP_LOCAL_DOCUMENTATION_INFO=/info
|
||||
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@ GNUSTEP_DEFAULT_PREFIX=/usr
|
|||
GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles
|
||||
|
||||
GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_SYSTEM_TOOLS=/bin
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
|
||||
GNUSTEP_SYSTEM_HEADERS=/include
|
||||
GNUSTEP_SYSTEM_LIBRARIES=/lib
|
||||
|
|
@ -43,7 +45,9 @@ GNUSTEP_SYSTEM_DOCUMENTATION_MAN=/man
|
|||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO=/info
|
||||
|
||||
GNUSTEP_NETWORK_APPS=/local/lib/GNUstep/Apps
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/local/lib/GNUstep/Apps
|
||||
GNUSTEP_NETWORK_TOOLS=/local/bin
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/local/sbin
|
||||
GNUSTEP_NETWORK_LIBRARY=/local/lib/GNUstep
|
||||
GNUSTEP_NETWORK_HEADERS=/local/include
|
||||
GNUSTEP_NETWORK_LIBRARIES=/local/lib
|
||||
|
|
@ -52,7 +56,9 @@ GNUSTEP_NETWORK_DOCUMENTATION_MAN=/local/man
|
|||
GNUSTEP_NETWORK_DOCUMENTATION_INFO=/local/info
|
||||
|
||||
GNUSTEP_LOCAL_APPS=/local/lib/GNUstep/Apps
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/local/lib/GNUstep/Apps
|
||||
GNUSTEP_LOCAL_TOOLS=/local/bin
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=/local/sbin
|
||||
GNUSTEP_LOCAL_LIBRARY=/local/lib/GNUstep
|
||||
GNUSTEP_LOCAL_HEADERS=/local/include
|
||||
GNUSTEP_LOCAL_LIBRARIES=/local/lib
|
||||
|
|
@ -61,7 +67,9 @@ GNUSTEP_LOCAL_DOCUMENTATION_MAN=/local/man
|
|||
GNUSTEP_LOCAL_DOCUMENTATION_INFO=/local/info
|
||||
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@ GNUSTEP_DEFAULT_PREFIX=/usr/GNUstep
|
|||
GNUSTEP_MAKEFILES=/System/Library/Makefiles
|
||||
|
||||
GNUSTEP_SYSTEM_APPS=/System/Applications
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/System/Applications/Admin
|
||||
GNUSTEP_SYSTEM_TOOLS=/System/Tools
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/System/Tools/Admin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/System/Library
|
||||
GNUSTEP_SYSTEM_HEADERS=/System/Library/Headers
|
||||
GNUSTEP_SYSTEM_LIBRARIES=/System/Library/Libraries
|
||||
|
|
@ -43,7 +45,9 @@ GNUSTEP_SYSTEM_DOCUMENTATION_MAN=/System/Library/Documentation/man
|
|||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO=/System/Library/Documentation/info
|
||||
|
||||
GNUSTEP_LOCAL_APPS=/Local/Applications
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
|
||||
GNUSTEP_LOCAL_TOOLS=/Local/Tools
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=/Local/Tools/Admin
|
||||
GNUSTEP_LOCAL_LIBRARY=/Local/Library
|
||||
GNUSTEP_LOCAL_HEADERS=/Local/Library/Headers
|
||||
GNUSTEP_LOCAL_LIBRARIES=/Local/Library/Libraries
|
||||
|
|
@ -52,7 +56,9 @@ GNUSTEP_LOCAL_DOCUMENTATION_MAN=/Local/Library/Documentation/man
|
|||
GNUSTEP_LOCAL_DOCUMENTATION_INFO=/Local/Library/Documentation/info
|
||||
|
||||
GNUSTEP_NETWORK_APPS=/Local/Applications
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/Local/Applications/Admin
|
||||
GNUSTEP_NETWORK_TOOLS=/Local/Tools
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/Local/Tools/Admin
|
||||
GNUSTEP_NETWORK_LIBRARY=/Local/Library
|
||||
GNUSTEP_NETWORK_HEADERS=/Local/Library/Headers
|
||||
GNUSTEP_NETWORK_LIBRARIES=/Local/Library/Libraries
|
||||
|
|
@ -61,7 +67,9 @@ GNUSTEP_NETWORK_DOCUMENTATION_MAN=/Local/Library/Documentation/man
|
|||
GNUSTEP_NETWORK_DOCUMENTATION_INFO=/Local/Library/Documentation/info
|
||||
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ GNUSTEP_DEFAULT_PREFIX=C:/GNUstep
|
|||
GNUSTEP_MAKEFILES=/System/Library/Makefiles
|
||||
|
||||
GNUSTEP_SYSTEM_APPS=/System/Applications
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/System/Applications/Admin
|
||||
GNUSTEP_SYSTEM_TOOLS=/System/Tools
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/System/Tools/Admin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/System/Library
|
||||
GNUSTEP_SYSTEM_HEADERS=/System/Library/Headers
|
||||
GNUSTEP_SYSTEM_LIBRARIES=/System/Library/Libraries
|
||||
|
|
@ -22,7 +24,9 @@ GNUSTEP_SYSTEM_DOCUMENTATION_MAN=/System/Library/Documentation/man
|
|||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO=/System/Library/Documentation/info
|
||||
|
||||
GNUSTEP_LOCAL_APPS=/Local/Applications
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
|
||||
GNUSTEP_LOCAL_TOOLS=/Local/Tools
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=/Local/Tools/Admin
|
||||
GNUSTEP_LOCAL_LIBRARY=/Local/Library
|
||||
GNUSTEP_LOCAL_HEADERS=/Local/Library/Headers
|
||||
GNUSTEP_LOCAL_LIBRARIES=/Local/Library/Libraries
|
||||
|
|
@ -31,7 +35,9 @@ GNUSTEP_LOCAL_DOCUMENTATION_MAN=/Local/Library/Documentation/man
|
|||
GNUSTEP_LOCAL_DOCUMENTATION_INFO=/Local/Library/Documentation/info
|
||||
|
||||
GNUSTEP_NETWORK_APPS=/Local/Applications
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/Local/Applications/Admin
|
||||
GNUSTEP_NETWORK_TOOLS=/Local/Tools
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/Local/Tools/Admin
|
||||
GNUSTEP_NETWORK_LIBRARY=/Local/Library
|
||||
GNUSTEP_NETWORK_HEADERS=/Local/Library/Headers
|
||||
GNUSTEP_NETWORK_LIBRARIES=/Local/Library/Libraries
|
||||
|
|
@ -40,7 +46,9 @@ GNUSTEP_NETWORK_DOCUMENTATION_MAN=/Local/Library/Documentation/man
|
|||
GNUSTEP_NETWORK_DOCUMENTATION_INFO=/Local/Library/Documentation/info
|
||||
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
|
|
|
|||
|
|
@ -99,7 +99,9 @@ reset_path PATH /Tools
|
|||
unset -f reset_path
|
||||
|
||||
unset GNUSTEP_SYSTEM_APPS
|
||||
unset GNUSTEP_SYSTEM_ADMIN_APPS
|
||||
unset GNUSTEP_SYSTEM_TOOLS
|
||||
unset GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
unset GNUSTEP_SYSTEM_LIBRARY
|
||||
unset GNUSTEP_SYSTEM_HEADERS
|
||||
unset GNUSTEP_SYSTEM_LIBRARIES
|
||||
|
|
@ -110,7 +112,9 @@ unset GNUSTEP_SYSTEM_DOCUMENTATION_MAN
|
|||
unset GNUSTEP_SYSTEM_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_LOCAL_APPS
|
||||
unset GNUSTEP_LOCAL_ADMIN_APPS
|
||||
unset GNUSTEP_LOCAL_TOOLS
|
||||
unset GNUSTEP_LOCAL_ADMIN_TOOLS
|
||||
unset GNUSTEP_LOCAL_LIBRARY
|
||||
unset GNUSTEP_LOCAL_HEADERS
|
||||
unset GNUSTEP_LOCAL_LIBRARIES
|
||||
|
|
@ -121,7 +125,9 @@ unset GNUSTEP_LOCAL_DOCUMENTATION_MAN
|
|||
unset GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_NETWORK_APPS
|
||||
unset GNUSTEP_NETWORK_ADMIN_APPS
|
||||
unset GNUSTEP_NETWORK_TOOLS
|
||||
unset GNUSTEP_NETWORK_ADMIN_TOOLS
|
||||
unset GNUSTEP_NETWORK_LIBRARY
|
||||
unset GNUSTEP_NETWORK_HEADERS
|
||||
unset GNUSTEP_NETWORK_LIBRARIES
|
||||
|
|
@ -132,7 +138,9 @@ unset GNUSTEP_NETWORK_DOCUMENTATION_MAN
|
|||
unset GNUSTEP_NETWORK_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_USER_APPS
|
||||
unset GNUSTEP_USER_ADMIN_APPS
|
||||
unset GNUSTEP_USER_TOOLS
|
||||
unset GNUSTEP_USER_ADMIN_TOOLS
|
||||
unset GNUSTEP_USER_LIBRARY
|
||||
unset GNUSTEP_USER_HEADERS
|
||||
unset GNUSTEP_USER_LIBRARIES
|
||||
|
|
@ -145,7 +153,9 @@ unset GNUSTEP_USER_DOCUMENTATION_INFO
|
|||
# These should not defined, but might be if something goes wrong
|
||||
# somewhere.
|
||||
unset GNUSTEP_USER_DIR_APPS
|
||||
unset GNUSTEP_USER_DIR_ADMIN_APPS
|
||||
unset GNUSTEP_USER_DIR_TOOLS
|
||||
unset GNUSTEP_USER_DIR_ADMIN_TOOLS
|
||||
unset GNUSTEP_USER_DIR_LIBRARY
|
||||
unset GNUSTEP_USER_DIR_HEADERS
|
||||
unset GNUSTEP_USER_DIR_LIBRARIES
|
||||
|
|
|
|||
|
|
@ -56,10 +56,21 @@ GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
|
|||
# Traditionally it is /usr/GNUstep/System/Apps.
|
||||
GNUSTEP_SYSTEM_APPS=@GNUSTEP_SYSTEM_APPS@
|
||||
|
||||
# This is where System GUI Applications that only the
|
||||
# Administrator can use get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Apps/Admin.
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=@GNUSTEP_SYSTEM_ADMIN_APPS@
|
||||
|
||||
# This is where System Command-Line Tools get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Tools.
|
||||
GNUSTEP_SYSTEM_TOOLS=@GNUSTEP_SYSTEM_TOOLS@
|
||||
|
||||
# This is where System Command-Line Tools that only the
|
||||
# Administrator can use get installed. Important: this
|
||||
# should not be in the PATH of normal users.
|
||||
# Traditionally it is /usr/GNUstep/System/Tools/Admin.
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=@GNUSTEP_SYSTEM_ADMIN_TOOLS@
|
||||
|
||||
# This is where System resources get installed. This directory will
|
||||
# contain a lot of executable code since *step traditionally likes to
|
||||
# bundle executables and resources together.
|
||||
|
|
@ -91,7 +102,9 @@ GNUSTEP_SYSTEM_DOCUMENTATION_INFO=@GNUSTEP_SYSTEM_DOCUMENTATION_INFO@
|
|||
|
||||
|
||||
GNUSTEP_NETWORK_APPS=@GNUSTEP_NETWORK_APPS@
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=@GNUSTEP_NETWORK_ADMIN_APPS@
|
||||
GNUSTEP_NETWORK_TOOLS=@GNUSTEP_NETWORK_TOOLS@
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=@GNUSTEP_NETWORK_ADMIN_TOOLS@
|
||||
GNUSTEP_NETWORK_LIBRARY=@GNUSTEP_NETWORK_LIBRARY@
|
||||
GNUSTEP_NETWORK_HEADERS=@GNUSTEP_NETWORK_HEADERS@
|
||||
GNUSTEP_NETWORK_LIBRARIES=@GNUSTEP_NETWORK_LIBRARIES@
|
||||
|
|
@ -100,7 +113,9 @@ GNUSTEP_NETWORK_DOCUMENTATION_MAN=@GNUSTEP_NETWORK_DOCUMENTATION_MAN@
|
|||
GNUSTEP_NETWORK_DOCUMENTATION_INFO=@GNUSTEP_NETWORK_DOCUMENTATION_INFO@
|
||||
|
||||
GNUSTEP_LOCAL_APPS=@GNUSTEP_LOCAL_APPS@
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=@GNUSTEP_LOCAL_ADMIN_APPS@
|
||||
GNUSTEP_LOCAL_TOOLS=@GNUSTEP_LOCAL_TOOLS@
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=@GNUSTEP_LOCAL_ADMIN_TOOLS@
|
||||
GNUSTEP_LOCAL_LIBRARY=@GNUSTEP_LOCAL_LIBRARY@
|
||||
GNUSTEP_LOCAL_HEADERS=@GNUSTEP_LOCAL_HEADERS@
|
||||
GNUSTEP_LOCAL_LIBRARIES=@GNUSTEP_LOCAL_LIBRARIES@
|
||||
|
|
@ -114,7 +129,9 @@ GNUSTEP_LOCAL_DOCUMENTATION_INFO=@GNUSTEP_LOCAL_DOCUMENTATION_INFO@
|
|||
# can set them to be absolute, mostly if you want to disable them
|
||||
# by setting them equal to the ones in the Network domain.
|
||||
GNUSTEP_USER_DIR_APPS=@GNUSTEP_USER_DIR_APPS@
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=@GNUSTEP_USER_DIR_ADMIN_APPS@
|
||||
GNUSTEP_USER_DIR_TOOLS=@GNUSTEP_USER_DIR_TOOLS@
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=@GNUSTEP_USER_DIR_ADMIN_TOOLS@
|
||||
GNUSTEP_USER_DIR_LIBRARY=@GNUSTEP_USER_DIR_LIBRARY@
|
||||
GNUSTEP_USER_DIR_HEADERS=@GNUSTEP_USER_DIR_HEADERS@
|
||||
GNUSTEP_USER_DIR_LIBRARIES=@GNUSTEP_USER_DIR_LIBRARIES@
|
||||
|
|
|
|||
|
|
@ -188,6 +188,14 @@ endif
|
|||
|
||||
set GNUSTEP_TOOLS_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_TOOLS" "$GNUSTEP_LOCAL_TOOLS" "$GNUSTEP_NETWORK_TOOLS" "$GNUSTEP_SYSTEM_TOOLS" $fixup_paths`
|
||||
|
||||
foreach dir ( "${GNUSTEP_SYSTEM_ADMIN_TOOLS}" "${GNUSTEP_NETWORK_ADMIN_TOOLS}" "${GNUSTEP_LOCAL_ADMIN_TOOLS}" "${GNUSTEP_USER_ADMIN_TOOLS}" )
|
||||
if ( -d "${dir}" && -w "${dir}" ) then
|
||||
if ( { (echo "${GNUSTEP_TOOLS_PATHLIST}" | fgrep -v "${dir}" >/dev/null) } ) then
|
||||
setenv GNUSTEP_TOOLS_PATHLIST "${dir}:${GNUSTEP_TOOLS_PATHLIST}"
|
||||
endif
|
||||
endif
|
||||
end
|
||||
|
||||
set temp_path = ""
|
||||
foreach dir ( `/bin/sh -c 'IFS=:; for i in ${GNUSTEP_TOOLS_PATHLIST}; do echo $i; done'` )
|
||||
set temp_path="${temp_path}${dir}:"
|
||||
|
|
@ -245,7 +253,9 @@ if ( -e "$GNUSTEP_USER_ROOT/GNUstep.csh" ) then
|
|||
endif
|
||||
|
||||
unsetenv GNUSTEP_SYSTEM_APPS
|
||||
unsetenv GNUSTEP_SYSTEM_ADMIN_APPS
|
||||
unsetenv GNUSTEP_SYSTEM_TOOLS
|
||||
unsetenv GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
unsetenv GNUSTEP_SYSTEM_LIBRARY
|
||||
unsetenv GNUSTEP_SYSTEM_HEADERS
|
||||
unsetenv GNUSTEP_SYSTEM_LIBRARIES
|
||||
|
|
@ -253,17 +263,10 @@ unsetenv GNUSTEP_SYSTEM_DOCUMENTATION
|
|||
unsetenv GNUSTEP_SYSTEM_DOCUMENTATION_MAN
|
||||
unsetenv GNUSTEP_SYSTEM_DOCUMENTATION_INFO
|
||||
|
||||
unsetenv GNUSTEP_LOCAL_APPS
|
||||
unsetenv GNUSTEP_LOCAL_TOOLS
|
||||
unsetenv GNUSTEP_LOCAL_LIBRARY
|
||||
unsetenv GNUSTEP_LOCAL_HEADERS
|
||||
unsetenv GNUSTEP_LOCAL_LIBRARIES
|
||||
unsetenv GNUSTEP_LOCAL_DOCUMENTATION
|
||||
unsetenv GNUSTEP_LOCAL_DOCUMENTATION_MAN
|
||||
unsetenv GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
unsetenv GNUSTEP_NETWORK_APPS
|
||||
unsetenv GNUSTEP_NETWORK_ADMIN_APPS
|
||||
unsetenv GNUSTEP_NETWORK_TOOLS
|
||||
unsetenv GNUSTEP_NETWORK_ADMIN_TOOLS
|
||||
unsetenv GNUSTEP_NETWORK_LIBRARY
|
||||
unsetenv GNUSTEP_NETWORK_HEADERS
|
||||
unsetenv GNUSTEP_NETWORK_LIBRARIES
|
||||
|
|
@ -271,8 +274,21 @@ unsetenv GNUSTEP_NETWORK_DOCUMENTATION
|
|||
unsetenv GNUSTEP_NETWORK_DOCUMENTATION_MAN
|
||||
unsetenv GNUSTEP_NETWORK_DOCUMENTATION_INFO
|
||||
|
||||
unsetenv GNUSTEP_LOCAL_APPS
|
||||
unsetenv GNUSTEP_LOCAL_ADMIN_APPS
|
||||
unsetenv GNUSTEP_LOCAL_TOOLS
|
||||
unsetenv GNUSTEP_LOCAL_ADMIN_TOOLS
|
||||
unsetenv GNUSTEP_LOCAL_LIBRARY
|
||||
unsetenv GNUSTEP_LOCAL_HEADERS
|
||||
unsetenv GNUSTEP_LOCAL_LIBRARIES
|
||||
unsetenv GNUSTEP_LOCAL_DOCUMENTATION
|
||||
unsetenv GNUSTEP_LOCAL_DOCUMENTATION_MAN
|
||||
unsetenv GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
unsetenv GNUSTEP_USER_APPS
|
||||
unsetenv GNUSTEP_USER_ADMIN_APPS
|
||||
unsetenv GNUSTEP_USER_TOOLS
|
||||
unsetenv GNUSTEP_USER_ADMIN_TOOLS
|
||||
unsetenv GNUSTEP_USER_LIBRARY
|
||||
unsetenv GNUSTEP_USER_HEADERS
|
||||
unsetenv GNUSTEP_USER_LIBRARIES
|
||||
|
|
|
|||
|
|
@ -235,6 +235,29 @@ fi
|
|||
#
|
||||
GNUSTEP_TOOLS_PATHLIST=`$GNUSTEP_MAKEFILES/print_unique_pathlist.sh "$GNUSTEP_USER_TOOLS" "$GNUSTEP_LOCAL_TOOLS" "$GNUSTEP_NETWORK_TOOLS" "$GNUSTEP_SYSTEM_TOOLS" $fixup_paths`
|
||||
|
||||
# Now, we check the paths in GNUSTEP_*_ADMIN_TOOLS. These paths
|
||||
# should only be used by Administrators -- normal users don't have
|
||||
# enough powers to use those tools to do useful things. Our test for
|
||||
# being an 'Administrator' is that anyone who can write to an Admin
|
||||
# directory can be considered powerful enough to use those tools.
|
||||
|
||||
# FIXME: Unfortunately, this doesn't work if the Admin directory
|
||||
# is mounted read-only, so a better test is required!
|
||||
|
||||
# So we examine GNUSTEP_*_ADMIN_TOOLS; if we find any path in that
|
||||
# list that exists and that we can write to, we add it to our PATH.
|
||||
for dir in "$GNUSTEP_SYSTEM_ADMIN_TOOLS" "$GNUSTEP_NETWORK_ADMIN_TOOLS" "$GNUSTEP_LOCAL_ADMIN_TOOLS" "$GNUSTEP_USER_ADMIN_TOOLS"; do
|
||||
if [ -d "$dir" -a -w "$dir" ]; then
|
||||
# Only add the new dir if it's not already in GNUSTEP_TOOLS_PATHLIST
|
||||
if (echo $GNUSTEP_TOOLS_PATHLIST | grep -v "$dir" >/dev/null); then
|
||||
GNUSTEP_TOOLS_PATHLIST="$dir:$GNUSTEP_TOOLS_PATHLIST"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
#
|
||||
# And now, we put the results into PATH
|
||||
#
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
temp_path=
|
||||
|
|
@ -382,24 +405,26 @@ fi
|
|||
# so it can print out all of the GNUstep variables.
|
||||
#
|
||||
if [ -n "$GNUSTEP_SH_EXPORT_ALL_VARIABLES" ]; then
|
||||
export GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_LIBRARY
|
||||
export GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES
|
||||
export GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_ADMIN_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
export GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES
|
||||
export GNUSTEP_SYSTEM_DOCUMENTATION GNUSTEP_SYSTEM_DOCUMENTATION_MAN GNUSTEP_SYSTEM_DOCUMENTATION_INFO
|
||||
|
||||
export GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_LIBRARY
|
||||
export GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES
|
||||
export GNUSTEP_LOCAL_DOCUMENTATION GNUSTEP_LOCAL_DOCUMENTATION_MAN GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
export GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_LIBRARY
|
||||
export GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES
|
||||
export GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_ADMIN_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_ADMIN_TOOLS
|
||||
export GNUSTEP_NETWORK_LIBRARY GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES
|
||||
export GNUSTEP_NETWORK_DOCUMENTATION GNUSTEP_NETWORK_DOCUMENTATION_MAN GNUSTEP_NETWORK_DOCUMENTATION_INFO
|
||||
|
||||
export GNUSTEP_USER_APPS GNUSTEP_USER_TOOLS GNUSTEP_USER_LIBRARY
|
||||
export GNUSTEP_USER_HEADERS GNUSTEP_USER_LIBRARIES
|
||||
export GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_ADMIN_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_ADMIN_TOOLS
|
||||
export GNUSTEP_LOCAL_LIBRARY GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES
|
||||
export GNUSTEP_LOCAL_DOCUMENTATION GNUSTEP_LOCAL_DOCUMENTATION_MAN GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
export GNUSTEP_USER_APPS GNUSTEP_USER_ADMIN_APPS GNUSTEP_USER_TOOLS GNUSTEP_USER_ADMIN_TOOLS
|
||||
export GNUSTEP_USER_LIBRARY GNUSTEP_USER_HEADERS GNUSTEP_USER_LIBRARIES
|
||||
export GNUSTEP_USER_DOCUMENTATION GNUSTEP_USER_DOCUMENTATION_MAN GNUSTEP_USER_DOCUMENTATION_INFO
|
||||
else
|
||||
unset GNUSTEP_SYSTEM_APPS
|
||||
unset GNUSTEP_SYSTEM_ADMIN_APPS
|
||||
unset GNUSTEP_SYSTEM_TOOLS
|
||||
unset GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
unset GNUSTEP_SYSTEM_LIBRARY
|
||||
unset GNUSTEP_SYSTEM_HEADERS
|
||||
unset GNUSTEP_SYSTEM_LIBRARIES
|
||||
|
|
@ -407,17 +432,10 @@ else
|
|||
unset GNUSTEP_SYSTEM_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_SYSTEM_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_LOCAL_APPS
|
||||
unset GNUSTEP_LOCAL_TOOLS
|
||||
unset GNUSTEP_LOCAL_LIBRARY
|
||||
unset GNUSTEP_LOCAL_HEADERS
|
||||
unset GNUSTEP_LOCAL_LIBRARIES
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_NETWORK_APPS
|
||||
unset GNUSTEP_NETWORK_ADMIN_APPS
|
||||
unset GNUSTEP_NETWORK_TOOLS
|
||||
unset GNUSTEP_NETWORK_ADMIN_TOOLS
|
||||
unset GNUSTEP_NETWORK_LIBRARY
|
||||
unset GNUSTEP_NETWORK_HEADERS
|
||||
unset GNUSTEP_NETWORK_LIBRARIES
|
||||
|
|
@ -425,8 +443,21 @@ else
|
|||
unset GNUSTEP_NETWORK_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_NETWORK_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_LOCAL_APPS
|
||||
unset GNUSTEP_LOCAL_ADMIN_APPS
|
||||
unset GNUSTEP_LOCAL_TOOLS
|
||||
unset GNUSTEP_LOCAL_ADMIN_TOOLS
|
||||
unset GNUSTEP_LOCAL_LIBRARY
|
||||
unset GNUSTEP_LOCAL_HEADERS
|
||||
unset GNUSTEP_LOCAL_LIBRARIES
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION_MAN
|
||||
unset GNUSTEP_LOCAL_DOCUMENTATION_INFO
|
||||
|
||||
unset GNUSTEP_USER_APPS
|
||||
unset GNUSTEP_USER_ADMIN_APPS
|
||||
unset GNUSTEP_USER_TOOLS
|
||||
unset GNUSTEP_USER_ADMIN_TOOLS
|
||||
unset GNUSTEP_USER_LIBRARY
|
||||
unset GNUSTEP_USER_HEADERS
|
||||
unset GNUSTEP_USER_LIBRARIES
|
||||
|
|
|
|||
|
|
@ -188,7 +188,9 @@ ifneq ($(GNUSTEP_INSTALLATION_DIR),)
|
|||
|
||||
# Use GNUSTEP_INSTALLATION_DIR to set the installation dirs
|
||||
GNUSTEP_APPS = $(GNUSTEP_INSTALLATION_DIR)/Applications
|
||||
GNUSTEP_ADMIN_APPS = $(GNUSTEP_INSTALLATION_DIR)/Applications/Admin
|
||||
GNUSTEP_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools
|
||||
GNUSTEP_ADMIN_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools/Admin
|
||||
GNUSTEP_LIBRARY = $(GNUSTEP_INSTALLATION_DIR)/Library
|
||||
GNUSTEP_SERVICES = $(GNUSTEP_LIBRARY)/Services
|
||||
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
|
||||
|
|
@ -224,7 +226,9 @@ else
|
|||
endif
|
||||
|
||||
GNUSTEP_APPS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_APPS)
|
||||
GNUSTEP_ADMIN_APPS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_ADMIN_APPS)
|
||||
GNUSTEP_TOOLS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_TOOLS)
|
||||
GNUSTEP_ADMIN_TOOLS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_ADMIN_TOOLS)
|
||||
GNUSTEP_LIBRARY = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_LIBRARY)
|
||||
GNUSTEP_SERVICES = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_SERVICES)
|
||||
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
|
||||
|
|
|
|||
47
configure
vendored
47
configure
vendored
|
|
@ -273,7 +273,7 @@ PACKAGE_BUGREPORT=
|
|||
|
||||
ac_unique_file="application.make"
|
||||
ac_default_prefix=NONE
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES GNUSTEP_SYSTEM_DOCUMENTATION GNUSTEP_SYSTEM_DOCUMENTATION_MAN GNUSTEP_SYSTEM_DOCUMENTATION_INFO GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_LIBRARY GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES GNUSTEP_LOCAL_DOCUMENTATION GNUSTEP_LOCAL_DOCUMENTATION_MAN GNUSTEP_LOCAL_DOCUMENTATION_INFO GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_LIBRARY GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES GNUSTEP_NETWORK_DOCUMENTATION GNUSTEP_NETWORK_DOCUMENTATION_MAN GNUSTEP_NETWORK_DOCUMENTATION_INFO GNUSTEP_USER_DIR_TOOLS GNUSTEP_USER_DIR_APPS GNUSTEP_USER_DIR_LIBRARY GNUSTEP_USER_DIR_HEADERS GNUSTEP_USER_DIR_LIBRARIES GNUSTEP_USER_DIR_DOCUMENTATION GNUSTEP_USER_DIR_DOCUMENTATION_MAN GNUSTEP_USER_DIR_DOCUMENTATION_INFO GNUSTEP_SYSTEM_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES GCC_WITH_PRECOMPILED_HEADERS SOLARIS_SHARED INCLUDES LIB_DIR OBJCFLAGS GNUMAKE MAKE_WITH_INFO_FUNCTION GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_ADMIN_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_ADMIN_TOOLS GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES GNUSTEP_SYSTEM_DOCUMENTATION GNUSTEP_SYSTEM_DOCUMENTATION_MAN GNUSTEP_SYSTEM_DOCUMENTATION_INFO GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_ADMIN_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_ADMIN_TOOLS GNUSTEP_NETWORK_LIBRARY GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES GNUSTEP_NETWORK_DOCUMENTATION GNUSTEP_NETWORK_DOCUMENTATION_MAN GNUSTEP_NETWORK_DOCUMENTATION_INFO GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_ADMIN_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_ADMIN_TOOLS GNUSTEP_LOCAL_LIBRARY GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES GNUSTEP_LOCAL_DOCUMENTATION GNUSTEP_LOCAL_DOCUMENTATION_MAN GNUSTEP_LOCAL_DOCUMENTATION_INFO GNUSTEP_USER_DIR_APPS GNUSTEP_USER_DIR_ADMIN_APPS GNUSTEP_USER_DIR_TOOLS GNUSTEP_USER_DIR_ADMIN_TOOLS GNUSTEP_USER_DIR_LIBRARY GNUSTEP_USER_DIR_HEADERS GNUSTEP_USER_DIR_LIBRARIES GNUSTEP_USER_DIR_DOCUMENTATION GNUSTEP_USER_DIR_DOCUMENTATION_MAN GNUSTEP_USER_DIR_DOCUMENTATION_INFO GNUSTEP_SYSTEM_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES GCC_WITH_PRECOMPILED_HEADERS SOLARIS_SHARED INCLUDES LIB_DIR OBJCFLAGS GNUMAKE MAKE_WITH_INFO_FUNCTION GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -3414,7 +3414,9 @@ echo "${ECHO_T}$GNUSTEP_PREFIX" >&6
|
|||
GNUSTEP_MAKEFILES="$GNUSTEP_PREFIX$GNUSTEP_MAKEFILES"
|
||||
|
||||
GNUSTEP_SYSTEM_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_APPS"
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_APPS"
|
||||
GNUSTEP_SYSTEM_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_TOOLS"
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_TOOLS"
|
||||
GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARY"
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_HEADERS"
|
||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
|
|
@ -3423,7 +3425,9 @@ GNUSTEP_SYSTEM_DOCUMENTATION_MAN="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOCUMENTATION_M
|
|||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOCUMENTATION_INFO"
|
||||
|
||||
GNUSTEP_NETWORK_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_APPS"
|
||||
GNUSTEP_NETWORK_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_APPS"
|
||||
GNUSTEP_NETWORK_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_TOOLS"
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_TOOLS"
|
||||
GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARY"
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_HEADERS"
|
||||
GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARIES"
|
||||
|
|
@ -3432,7 +3436,9 @@ GNUSTEP_NETWORK_DOCUMENTATION_MAN="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOCUMENTATION
|
|||
GNUSTEP_NETWORK_DOCUMENTATION_INFO="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOCUMENTATION_INFO"
|
||||
|
||||
GNUSTEP_LOCAL_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_APPS"
|
||||
GNUSTEP_LOCAL_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_APPS"
|
||||
GNUSTEP_LOCAL_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_TOOLS"
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_TOOLS"
|
||||
GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARY"
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_HEADERS"
|
||||
GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARIES"
|
||||
|
|
@ -3783,6 +3789,15 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -5423,32 +5438,40 @@ s,@GNUSTEP_MAKEFILES@,$GNUSTEP_MAKEFILES,;t t
|
|||
s,@HOST_INSTALL@,$HOST_INSTALL,;t t
|
||||
s,@GNUSTEP_FLATTENED@,$GNUSTEP_FLATTENED,;t t
|
||||
s,@GNUSTEP_IS_FLATTENED@,$GNUSTEP_IS_FLATTENED,;t t
|
||||
s,@GNUSTEP_SYSTEM_TOOLS@,$GNUSTEP_SYSTEM_TOOLS,;t t
|
||||
s,@GNUSTEP_SYSTEM_APPS@,$GNUSTEP_SYSTEM_APPS,;t t
|
||||
s,@GNUSTEP_SYSTEM_ADMIN_APPS@,$GNUSTEP_SYSTEM_ADMIN_APPS,;t t
|
||||
s,@GNUSTEP_SYSTEM_TOOLS@,$GNUSTEP_SYSTEM_TOOLS,;t t
|
||||
s,@GNUSTEP_SYSTEM_ADMIN_TOOLS@,$GNUSTEP_SYSTEM_ADMIN_TOOLS,;t t
|
||||
s,@GNUSTEP_SYSTEM_LIBRARY@,$GNUSTEP_SYSTEM_LIBRARY,;t t
|
||||
s,@GNUSTEP_SYSTEM_HEADERS@,$GNUSTEP_SYSTEM_HEADERS,;t t
|
||||
s,@GNUSTEP_SYSTEM_LIBRARIES@,$GNUSTEP_SYSTEM_LIBRARIES,;t t
|
||||
s,@GNUSTEP_SYSTEM_DOCUMENTATION@,$GNUSTEP_SYSTEM_DOCUMENTATION,;t t
|
||||
s,@GNUSTEP_SYSTEM_DOCUMENTATION_MAN@,$GNUSTEP_SYSTEM_DOCUMENTATION_MAN,;t t
|
||||
s,@GNUSTEP_SYSTEM_DOCUMENTATION_INFO@,$GNUSTEP_SYSTEM_DOCUMENTATION_INFO,;t t
|
||||
s,@GNUSTEP_LOCAL_TOOLS@,$GNUSTEP_LOCAL_TOOLS,;t t
|
||||
s,@GNUSTEP_LOCAL_APPS@,$GNUSTEP_LOCAL_APPS,;t t
|
||||
s,@GNUSTEP_LOCAL_LIBRARY@,$GNUSTEP_LOCAL_LIBRARY,;t t
|
||||
s,@GNUSTEP_LOCAL_HEADERS@,$GNUSTEP_LOCAL_HEADERS,;t t
|
||||
s,@GNUSTEP_LOCAL_LIBRARIES@,$GNUSTEP_LOCAL_LIBRARIES,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION@,$GNUSTEP_LOCAL_DOCUMENTATION,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION_MAN@,$GNUSTEP_LOCAL_DOCUMENTATION_MAN,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION_INFO@,$GNUSTEP_LOCAL_DOCUMENTATION_INFO,;t t
|
||||
s,@GNUSTEP_NETWORK_TOOLS@,$GNUSTEP_NETWORK_TOOLS,;t t
|
||||
s,@GNUSTEP_NETWORK_APPS@,$GNUSTEP_NETWORK_APPS,;t t
|
||||
s,@GNUSTEP_NETWORK_ADMIN_APPS@,$GNUSTEP_NETWORK_ADMIN_APPS,;t t
|
||||
s,@GNUSTEP_NETWORK_TOOLS@,$GNUSTEP_NETWORK_TOOLS,;t t
|
||||
s,@GNUSTEP_NETWORK_ADMIN_TOOLS@,$GNUSTEP_NETWORK_ADMIN_TOOLS,;t t
|
||||
s,@GNUSTEP_NETWORK_LIBRARY@,$GNUSTEP_NETWORK_LIBRARY,;t t
|
||||
s,@GNUSTEP_NETWORK_HEADERS@,$GNUSTEP_NETWORK_HEADERS,;t t
|
||||
s,@GNUSTEP_NETWORK_LIBRARIES@,$GNUSTEP_NETWORK_LIBRARIES,;t t
|
||||
s,@GNUSTEP_NETWORK_DOCUMENTATION@,$GNUSTEP_NETWORK_DOCUMENTATION,;t t
|
||||
s,@GNUSTEP_NETWORK_DOCUMENTATION_MAN@,$GNUSTEP_NETWORK_DOCUMENTATION_MAN,;t t
|
||||
s,@GNUSTEP_NETWORK_DOCUMENTATION_INFO@,$GNUSTEP_NETWORK_DOCUMENTATION_INFO,;t t
|
||||
s,@GNUSTEP_USER_DIR_TOOLS@,$GNUSTEP_USER_DIR_TOOLS,;t t
|
||||
s,@GNUSTEP_LOCAL_APPS@,$GNUSTEP_LOCAL_APPS,;t t
|
||||
s,@GNUSTEP_LOCAL_ADMIN_APPS@,$GNUSTEP_LOCAL_ADMIN_APPS,;t t
|
||||
s,@GNUSTEP_LOCAL_TOOLS@,$GNUSTEP_LOCAL_TOOLS,;t t
|
||||
s,@GNUSTEP_LOCAL_ADMIN_TOOLS@,$GNUSTEP_LOCAL_ADMIN_TOOLS,;t t
|
||||
s,@GNUSTEP_LOCAL_LIBRARY@,$GNUSTEP_LOCAL_LIBRARY,;t t
|
||||
s,@GNUSTEP_LOCAL_HEADERS@,$GNUSTEP_LOCAL_HEADERS,;t t
|
||||
s,@GNUSTEP_LOCAL_LIBRARIES@,$GNUSTEP_LOCAL_LIBRARIES,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION@,$GNUSTEP_LOCAL_DOCUMENTATION,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION_MAN@,$GNUSTEP_LOCAL_DOCUMENTATION_MAN,;t t
|
||||
s,@GNUSTEP_LOCAL_DOCUMENTATION_INFO@,$GNUSTEP_LOCAL_DOCUMENTATION_INFO,;t t
|
||||
s,@GNUSTEP_USER_DIR_APPS@,$GNUSTEP_USER_DIR_APPS,;t t
|
||||
s,@GNUSTEP_USER_DIR_ADMIN_APPS@,$GNUSTEP_USER_DIR_ADMIN_APPS,;t t
|
||||
s,@GNUSTEP_USER_DIR_TOOLS@,$GNUSTEP_USER_DIR_TOOLS,;t t
|
||||
s,@GNUSTEP_USER_DIR_ADMIN_TOOLS@,$GNUSTEP_USER_DIR_ADMIN_TOOLS,;t t
|
||||
s,@GNUSTEP_USER_DIR_LIBRARY@,$GNUSTEP_USER_DIR_LIBRARY,;t t
|
||||
s,@GNUSTEP_USER_DIR_HEADERS@,$GNUSTEP_USER_DIR_HEADERS,;t t
|
||||
s,@GNUSTEP_USER_DIR_LIBRARIES@,$GNUSTEP_USER_DIR_LIBRARIES,;t t
|
||||
|
|
|
|||
39
configure.ac
39
configure.ac
|
|
@ -306,7 +306,9 @@ AC_MSG_RESULT($GNUSTEP_PREFIX)
|
|||
GNUSTEP_MAKEFILES="$GNUSTEP_PREFIX$GNUSTEP_MAKEFILES"
|
||||
|
||||
GNUSTEP_SYSTEM_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_APPS"
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_APPS"
|
||||
GNUSTEP_SYSTEM_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_TOOLS"
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_TOOLS"
|
||||
GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARY"
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_HEADERS"
|
||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
|
|
@ -315,7 +317,9 @@ GNUSTEP_SYSTEM_DOCUMENTATION_MAN="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOCUMENTATION_M
|
|||
GNUSTEP_SYSTEM_DOCUMENTATION_INFO="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOCUMENTATION_INFO"
|
||||
|
||||
GNUSTEP_NETWORK_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_APPS"
|
||||
GNUSTEP_NETWORK_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_APPS"
|
||||
GNUSTEP_NETWORK_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_TOOLS"
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_TOOLS"
|
||||
GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARY"
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_HEADERS"
|
||||
GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARIES"
|
||||
|
|
@ -324,7 +328,9 @@ GNUSTEP_NETWORK_DOCUMENTATION_MAN="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOCUMENTATION
|
|||
GNUSTEP_NETWORK_DOCUMENTATION_INFO="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOCUMENTATION_INFO"
|
||||
|
||||
GNUSTEP_LOCAL_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_APPS"
|
||||
GNUSTEP_LOCAL_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_APPS"
|
||||
GNUSTEP_LOCAL_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_TOOLS"
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_TOOLS"
|
||||
GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARY"
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_HEADERS"
|
||||
GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARIES"
|
||||
|
|
@ -660,8 +666,11 @@ fi
|
|||
# Output the full filesystem layout
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
AC_SUBST(GNUSTEP_SYSTEM_TOOLS)
|
||||
|
||||
AC_SUBST(GNUSTEP_SYSTEM_APPS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_ADMIN_APPS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_TOOLS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_ADMIN_TOOLS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
|
||||
|
|
@ -669,17 +678,10 @@ AC_SUBST(GNUSTEP_SYSTEM_DOCUMENTATION)
|
|||
AC_SUBST(GNUSTEP_SYSTEM_DOCUMENTATION_MAN)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_DOCUMENTATION_INFO)
|
||||
|
||||
AC_SUBST(GNUSTEP_LOCAL_TOOLS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_APPS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_LOCAL_HEADERS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_LIBRARIES)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION_MAN)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION_INFO)
|
||||
|
||||
AC_SUBST(GNUSTEP_NETWORK_TOOLS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_APPS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_ADMIN_APPS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_TOOLS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_ADMIN_TOOLS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_NETWORK_HEADERS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_LIBRARIES)
|
||||
|
|
@ -687,8 +689,21 @@ AC_SUBST(GNUSTEP_NETWORK_DOCUMENTATION)
|
|||
AC_SUBST(GNUSTEP_NETWORK_DOCUMENTATION_MAN)
|
||||
AC_SUBST(GNUSTEP_NETWORK_DOCUMENTATION_INFO)
|
||||
|
||||
AC_SUBST(GNUSTEP_USER_DIR_TOOLS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_APPS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_ADMIN_APPS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_TOOLS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_ADMIN_TOOLS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_LOCAL_HEADERS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_LIBRARIES)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION_MAN)
|
||||
AC_SUBST(GNUSTEP_LOCAL_DOCUMENTATION_INFO)
|
||||
|
||||
AC_SUBST(GNUSTEP_USER_DIR_APPS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_ADMIN_APPS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_TOOLS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_ADMIN_TOOLS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_LIBRARY)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_HEADERS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_LIBRARIES)
|
||||
|
|
|
|||
|
|
@ -40,7 +40,9 @@ basepath="$1"
|
|||
|
||||
${mydir}/mkinstalldirs "$basepath" \
|
||||
"$basepath"/Applications \
|
||||
"$basepath"/Applications/Admin \
|
||||
"$basepath"/Tools/${GNUSTEP_TARGET_LDIR} \
|
||||
"$basepath"/Tools/Admin/${GNUSTEP_TARGET_LDIR} \
|
||||
"$basepath"/Tools/Resources \
|
||||
"$basepath"/Tools/Java \
|
||||
"$basepath"/Library/ApplicationSupport \
|
||||
|
|
|
|||
|
|
@ -32,9 +32,15 @@
|
|||
if ( ! ${?GNUSTEP_SYSTEM_APPS} ) then
|
||||
setenv GNUSTEP_SYSTEM_APPS "@GNUSTEP_SYSTEM_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_ADMIN_APPS} ) then
|
||||
setenv GNUSTEP_SYSTEM_ADMIN_APPS "@GNUSTEP_SYSTEM_ADMIN_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_TOOLS} ) then
|
||||
setenv GNUSTEP_SYSTEM_TOOLS "@GNUSTEP_SYSTEM_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_ADMIN_TOOLS} ) then
|
||||
setenv GNUSTEP_SYSTEM_ADMIN_TOOLS "@GNUSTEP_SYSTEM_ADMIN_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_LIBRARY} ) then
|
||||
setenv GNUSTEP_SYSTEM_LIBRARY "@GNUSTEP_SYSTEM_LIBRARY@"
|
||||
endif
|
||||
|
|
@ -60,9 +66,15 @@ endif
|
|||
if ( ! ${?GNUSTEP_LOCAL_APPS} ) then
|
||||
setenv GNUSTEP_LOCAL_APPS "@GNUSTEP_LOCAL_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_ADMIN_APPS} ) then
|
||||
setenv GNUSTEP_LOCAL_ADMIN_APPS "@GNUSTEP_LOCAL_ADMIN_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_TOOLS} ) then
|
||||
setenv GNUSTEP_LOCAL_TOOLS "@GNUSTEP_LOCAL_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_ADMIN_TOOLS} ) then
|
||||
setenv GNUSTEP_LOCAL_ADMIN_TOOLS "@GNUSTEP_LOCAL_ADMIN_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_LIBRARY} ) then
|
||||
setenv GNUSTEP_LOCAL_LIBRARY "@GNUSTEP_LOCAL_LIBRARY@"
|
||||
endif
|
||||
|
|
@ -88,9 +100,15 @@ endif
|
|||
if ( ! ${?GNUSTEP_NETWORK_APPS} ) then
|
||||
setenv GNUSTEP_NETWORK_APPS "@GNUSTEP_NETWORK_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_ADMIN_APPS} ) then
|
||||
setenv GNUSTEP_NETWORK_ADMIN_APPS "@GNUSTEP_NETWORK_ADMIN_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_TOOLS} ) then
|
||||
setenv GNUSTEP_NETWORK_TOOLS "@GNUSTEP_NETWORK_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_ADMIN_TOOLS} ) then
|
||||
setenv GNUSTEP_NETWORK_ADMIN_TOOLS "@GNUSTEP_NETWORK_ADMIN_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_LIBRARY} ) then
|
||||
setenv GNUSTEP_NETWORK_LIBRARY "@GNUSTEP_NETWORK_LIBRARY@"
|
||||
endif
|
||||
|
|
@ -116,9 +134,15 @@ endif
|
|||
if ( ! ${?GNUSTEP_USER_DIR_APPS} ) then
|
||||
setenv GNUSTEP_USER_DIR_APPS "@GNUSTEP_USER_DIR_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_ADMIN_APPS} ) then
|
||||
setenv GNUSTEP_USER_DIR_ADMIN_APPS "@GNUSTEP_USER_DIR_ADMIN_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_TOOLS} ) then
|
||||
setenv GNUSTEP_USER_DIR_TOOLS "@GNUSTEP_USER_DIR_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_ADMIN_TOOLS} ) then
|
||||
setenv GNUSTEP_USER_DIR_ADMIN_TOOLS "@GNUSTEP_USER_DIR_ADMIN_TOOLS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_LIBRARY} ) then
|
||||
setenv GNUSTEP_USER_DIR_LIBRARY "@GNUSTEP_USER_DIR_LIBRARY@"
|
||||
endif
|
||||
|
|
@ -147,6 +171,15 @@ switch ("${GNUSTEP_USER_DIR_APPS}")
|
|||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_ADMIN_APPS}")
|
||||
case /*: # An absolute path
|
||||
setenv GNUSTEP_USER_ADMIN_APPS "${GNUSTEP_USER_DIR_ADMIN_APPS}"
|
||||
breaksw
|
||||
default: # Something else
|
||||
setenv GNUSTEP_USER_ADMIN_APPS "${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_ADMIN_APPS}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_TOOLS}")
|
||||
case /*:
|
||||
setenv GNUSTEP_USER_TOOLS "${GNUSTEP_USER_DIR_TOOLS}"
|
||||
|
|
@ -156,6 +189,15 @@ switch ("${GNUSTEP_USER_DIR_TOOLS}")
|
|||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_ADMIN_TOOLS}")
|
||||
case /*:
|
||||
setenv GNUSTEP_USER_ADMIN_TOOLS "${GNUSTEP_USER_DIR_ADMIN_TOOLS}"
|
||||
breaksw
|
||||
default:
|
||||
setenv GNUSTEP_USER_ADMIN_TOOLS "${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_ADMIN_TOOLS}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_LIBRARY}")
|
||||
case /*:
|
||||
setenv GNUSTEP_USER_LIBRARY "${GNUSTEP_USER_DIR_LIBRARY}"
|
||||
|
|
@ -211,7 +253,9 @@ switch ("${GNUSTEP_USER_DIR_DOCUMENTATION_INFO}")
|
|||
endsw
|
||||
|
||||
unsetenv GNUSTEP_USER_DIR_APPS
|
||||
unsetenv GNUSTEP_USER_DIR_ADMIN_APPS
|
||||
unsetenv GNUSTEP_USER_DIR_TOOLS
|
||||
unsetenv GNUSTEP_USER_DIR_ADMIN_TOOLS
|
||||
unsetenv GNUSTEP_USER_DIR_LIBRARY
|
||||
unsetenv GNUSTEP_USER_DIR_HEADERS
|
||||
unsetenv GNUSTEP_USER_DIR_LIBRARIES
|
||||
|
|
|
|||
|
|
@ -48,7 +48,9 @@
|
|||
# SYSTEM domain
|
||||
#
|
||||
GNUSTEP_SYSTEM_APPS ?= @GNUSTEP_SYSTEM_APPS@
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS ?= @GNUSTEP_SYSTEM_ADMIN_APPS@
|
||||
GNUSTEP_SYSTEM_TOOLS ?= @GNUSTEP_SYSTEM_TOOLS@
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS ?= @GNUSTEP_SYSTEM_ADMIN_TOOLS@
|
||||
GNUSTEP_SYSTEM_LIBRARY ?= @GNUSTEP_SYSTEM_LIBRARY@
|
||||
GNUSTEP_SYSTEM_HEADERS ?= @GNUSTEP_SYSTEM_HEADERS@
|
||||
GNUSTEP_SYSTEM_LIBRARIES ?= @GNUSTEP_SYSTEM_LIBRARIES@
|
||||
|
|
@ -72,7 +74,9 @@ GNUSTEP_SYSTEM_JAVA = $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Java
|
|||
# LOCAL domain
|
||||
#
|
||||
GNUSTEP_LOCAL_APPS ?= @GNUSTEP_LOCAL_APPS@
|
||||
GNUSTEP_LOCAL_ADMIN_APPS ?= @GNUSTEP_LOCAL_ADMIN_APPS@
|
||||
GNUSTEP_LOCAL_TOOLS ?= @GNUSTEP_LOCAL_TOOLS@
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS ?= @GNUSTEP_LOCAL_ADMIN_TOOLS@
|
||||
GNUSTEP_LOCAL_LIBRARY ?= @GNUSTEP_LOCAL_LIBRARY@
|
||||
GNUSTEP_LOCAL_HEADERS ?= @GNUSTEP_LOCAL_HEADERS@
|
||||
GNUSTEP_LOCAL_LIBRARIES ?= @GNUSTEP_LOCAL_LIBRARIES@
|
||||
|
|
@ -97,7 +101,9 @@ GNUSTEP_LOCAL_JAVA = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Java
|
|||
# NETWORK domain
|
||||
#
|
||||
GNUSTEP_NETWORK_APPS ?= @GNUSTEP_NETWORK_APPS@
|
||||
GNUSTEP_NETWORK_ADMIN_APPS ?= @GNUSTEP_NETWORK_ADMIN_APPS@
|
||||
GNUSTEP_NETWORK_TOOLS ?= @GNUSTEP_NETWORK_TOOLS@
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS ?= @GNUSTEP_NETWORK_ADMIN_TOOLS@
|
||||
GNUSTEP_NETWORK_LIBRARY ?= @GNUSTEP_NETWORK_LIBRARY@
|
||||
GNUSTEP_NETWORK_HEADERS ?= @GNUSTEP_NETWORK_HEADERS@
|
||||
GNUSTEP_NETWORK_LIBRARIES ?= @GNUSTEP_NETWORK_LIBRARIES@
|
||||
|
|
@ -124,7 +130,9 @@ GNUSTEP_NETWORK_JAVA = $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Java
|
|||
# GNUSTEP_HOME.
|
||||
#
|
||||
GNUSTEP_USER_DIR_APPS ?= @GNUSTEP_USER_DIR_APPS@
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS ?= @GNUSTEP_USER_DIR_ADMIN_APPS@
|
||||
GNUSTEP_USER_DIR_TOOLS ?= @GNUSTEP_USER_DIR_TOOLS@
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS ?= @GNUSTEP_USER_DIR_ADMIN_TOOLS@
|
||||
GNUSTEP_USER_DIR_LIBRARY ?= @GNUSTEP_USER_DIR_LIBRARY@
|
||||
GNUSTEP_USER_DIR_HEADERS ?= @GNUSTEP_USER_DIR_HEADERS@
|
||||
GNUSTEP_USER_DIR_LIBRARIES ?= @GNUSTEP_USER_DIR_LIBRARIES@
|
||||
|
|
|
|||
|
|
@ -49,9 +49,15 @@
|
|||
if [ -z "$GNUSTEP_SYSTEM_APPS" ];
|
||||
then GNUSTEP_SYSTEM_APPS="@GNUSTEP_SYSTEM_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_ADMIN_APPS" ];
|
||||
then GNUSTEP_SYSTEM_ADMIN_APPS="@GNUSTEP_SYSTEM_ADMIN_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_TOOLS" ];
|
||||
then GNUSTEP_SYSTEM_TOOLS="@GNUSTEP_SYSTEM_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_ADMIN_TOOLS" ];
|
||||
then GNUSTEP_SYSTEM_ADMIN_TOOLS="@GNUSTEP_SYSTEM_ADMIN_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_LIBRARY" ];
|
||||
then GNUSTEP_SYSTEM_LIBRARY="@GNUSTEP_SYSTEM_LIBRARY@"
|
||||
fi
|
||||
|
|
@ -78,9 +84,15 @@ fi
|
|||
if [ -z "$GNUSTEP_LOCAL_APPS" ];
|
||||
then GNUSTEP_LOCAL_APPS="@GNUSTEP_LOCAL_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_ADMIN_APPS" ];
|
||||
then GNUSTEP_LOCAL_ADMIN_APPS="@GNUSTEP_LOCAL_ADMIN_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_TOOLS" ];
|
||||
then GNUSTEP_LOCAL_TOOLS="@GNUSTEP_LOCAL_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_ADMIN_TOOLS" ];
|
||||
then GNUSTEP_LOCAL_ADMIN_TOOLS="@GNUSTEP_LOCAL_ADMIN_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_LIBRARY" ];
|
||||
then GNUSTEP_LOCAL_LIBRARY="@GNUSTEP_LOCAL_LIBRARY@"
|
||||
fi
|
||||
|
|
@ -106,9 +118,15 @@ fi
|
|||
if [ -z "$GNUSTEP_NETWORK_APPS" ];
|
||||
then GNUSTEP_NETWORK_APPS="@GNUSTEP_NETWORK_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_ADMIN_APPS" ];
|
||||
then GNUSTEP_NETWORK_ADMIN_APPS="@GNUSTEP_NETWORK_ADMIN_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_TOOLS" ];
|
||||
then GNUSTEP_NETWORK_TOOLS="@GNUSTEP_NETWORK_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_ADMIN_TOOLS" ];
|
||||
then GNUSTEP_NETWORK_ADMIN_TOOLS="@GNUSTEP_NETWORK_ADMIN_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_LIBRARY" ];
|
||||
then GNUSTEP_NETWORK_LIBRARY="@GNUSTEP_NETWORK_LIBRARY@"
|
||||
fi
|
||||
|
|
@ -134,9 +152,15 @@ fi
|
|||
if [ -z "$GNUSTEP_USER_DIR_APPS" ];
|
||||
then GNUSTEP_USER_DIR_APPS="@GNUSTEP_USER_DIR_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_ADMIN_APPS" ];
|
||||
then GNUSTEP_USER_DIR_ADMIN_APPS="@GNUSTEP_USER_DIR_ADMIN_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_TOOLS" ];
|
||||
then GNUSTEP_USER_DIR_TOOLS="@GNUSTEP_USER_DIR_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_ADMIN_TOOLS" ];
|
||||
then GNUSTEP_USER_DIR_ADMIN_TOOLS="@GNUSTEP_USER_DIR_ADMIN_TOOLS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_LIBRARY" ];
|
||||
then GNUSTEP_USER_DIR_LIBRARY="@GNUSTEP_USER_DIR_LIBRARY@"
|
||||
fi
|
||||
|
|
@ -168,12 +192,26 @@ case "$GNUSTEP_USER_DIR_APPS" in
|
|||
esac
|
||||
unset GNUSTEP_USER_DIR_APPS
|
||||
|
||||
case "$GNUSTEP_USER_DIR_ADMIN_APPS" in
|
||||
/*) # An absolute path
|
||||
GNUSTEP_USER_ADMIN_APPS="$GNUSTEP_USER_DIR_ADMIN_APPS";;
|
||||
*) # Something else
|
||||
GNUSTEP_USER_ADMIN_APPS="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_ADMIN_APPS";;
|
||||
esac
|
||||
unset GNUSTEP_USER_DIR_ADMIN_APPS
|
||||
|
||||
case "$GNUSTEP_USER_DIR_TOOLS" in
|
||||
/*) GNUSTEP_USER_TOOLS="$GNUSTEP_USER_DIR_TOOLS";;
|
||||
*) GNUSTEP_USER_TOOLS="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_TOOLS";;
|
||||
esac
|
||||
unset GNUSTEP_USER_DIR_TOOLS
|
||||
|
||||
case "$GNUSTEP_USER_DIR_ADMIN_TOOLS" in
|
||||
/*) GNUSTEP_USER_ADMIN_TOOLS="$GNUSTEP_USER_DIR_ADMIN_TOOLS";;
|
||||
*) GNUSTEP_USER_ADMIN_TOOLS="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_ADMIN_TOOLS";;
|
||||
esac
|
||||
unset GNUSTEP_USER_DIR_ADMIN_TOOLS
|
||||
|
||||
case "$GNUSTEP_USER_DIR_LIBRARY" in
|
||||
/*) GNUSTEP_USER_LIBRARY="$GNUSTEP_USER_DIR_LIBRARY";;
|
||||
*) GNUSTEP_USER_LIBRARY="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_LIBRARY";;
|
||||
|
|
|
|||
24
openapp.in
24
openapp.in
|
|
@ -204,6 +204,30 @@ case "$openapp_app" in
|
|||
fi
|
||||
done
|
||||
if [ -z "$openapp_full_appname" ]; then
|
||||
|
||||
# Now search the Admin Apps locations ... but only if they are
|
||||
# Administrators. But how do we know if we are an Admin ? We
|
||||
# need a portable way. Our first attempt here is to check if
|
||||
# we can write to an ADMIN directory, we are an Administrator.
|
||||
# So, if any GNUSTEP_*_ADMIN_APPS directory exists and we can
|
||||
# write to it, then we consider us enough powerful to execute
|
||||
# applications from it and search in it.
|
||||
#
|
||||
# FIXME: Unfortunately, this doesn't work if the Admin directory
|
||||
# is mounted read-only, so a better test is required!
|
||||
#
|
||||
for openapp_dir in "$GNUSTEP_USER_ADMIN_APPS" "$GNUSTEP_LOCAL_ADMIN_APPS" "$GNUSTEP_NETWORK_ADMIN_APPS" "$GNUSTEP_SYSTEM_ADMIN_APPS"; do
|
||||
if [ -d "$openapp_dir" -a -w "$openapp_dir" ]; then
|
||||
if [ -n "$openapp_only_find" ]; then
|
||||
echo "Trying $openapp_dir/$openapp_app..."
|
||||
fi
|
||||
if [ -d "$openapp_dir/$openapp_app" ]; then
|
||||
openapp_full_appname="`(cd \"$openapp_dir/$openapp_app\"; pwd)`"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
# And now search the standard PATH (may include '.')
|
||||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
|
|
|
|||
|
|
@ -158,6 +158,7 @@ case "$tool" in
|
|||
# subdirectory, then the top-level directory.
|
||||
# (For flattened systems we skip the first two options.
|
||||
#
|
||||
# TODO: Also search Admin Tools directories if appropriate
|
||||
for dir in "$GNUSTEP_USER_TOOLS" "$GNUSTEP_LOCAL_TOOLS" "$GNUSTEP_NETWORK_TOOLS" "$GNUSTEP_SYSTEM_TOOLS" ; do
|
||||
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
|
||||
tmpgnudir="$dir/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
|
||||
|
|
|
|||
Loading…
Reference in a new issue