mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Added GNUSTEP_*_WEB_APPS for GSWeb and SOPE; fixed some minor filesystem layouts bits
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24769 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
87fbddf426
commit
b55d6b203c
15 changed files with 306 additions and 145 deletions
46
ChangeLog
46
ChangeLog
|
|
@ -1,3 +1,49 @@
|
|||
2007-03-05 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Added GNUSTEP_WEB_APPS variable that can be used by GSWeb and SOPE
|
||||
to decide where to install their web applications.
|
||||
* common.make (GNUSTEP_WEB_APPS): New variable.
|
||||
* Instance/gswapp.make: Install into GNUSTEP_WEB_APPS by default.
|
||||
Define GNUSTEP_GSWAPPS in terms of GNUSTEP_WEB_APPS for backwards
|
||||
compatibility.
|
||||
|
||||
* configure.ac (GNUSTEP_SYSTEM_WEB_APPS, GNUSTEP_LOCAL_WEB_APPS,
|
||||
GNUSTEP_NETWORK_WEB_APPS, GNUSTEP_USER_DIR_WEB_APPS): New
|
||||
variables; read them from filesystem layout files, output them.
|
||||
* configure: Regenerated.
|
||||
|
||||
* FilesystemLayouts/gnustep (GNUSTEP_SYSTEM_WEB_APPS,
|
||||
GNUSTEP_LOCAL_WEB_APPS, GNUSTEP_NETWORK_WEB_APPS,
|
||||
GNUSTEP_USER_DIR_WEB_APPS): New variables.
|
||||
* FilesystemLayouts/gnustep-with-network: Same change.
|
||||
* FilesystemLayouts/fhs: Same change.
|
||||
* FilesystemLayouts/next: Same change.
|
||||
* filesystem.make.in: Same change.
|
||||
* filesystem.sh.in: Same change.
|
||||
* filesystem.csh.in: Same change.
|
||||
* GNUstep.conf.in: Same change.
|
||||
* GNUstep-reset.sh: Same change.
|
||||
* GNUstep.sh.in: Same change.
|
||||
|
||||
2007-03-05 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* FilesystemLayouts/fhs (GNUSTEP_SYSTEM_APPS, GNUSTEP_LOCAL_APPS,
|
||||
GNUSTEP_NETWORK_APPS, GNUSTEP_USER_DIR_APPS): Use 'Applications',
|
||||
not 'Apps', for the filesystem location.
|
||||
|
||||
* FilesystemLayouts/gnustep-with-network: Moved Network variables
|
||||
before Local ones.
|
||||
* filesystem.make.in: Same change.
|
||||
* filesystem.sh.in: Same change.
|
||||
* filesystem.csh.in: Same change.
|
||||
* GNUstep-reset.sh: Same change.
|
||||
|
||||
* filesystem.make.in (GNUSTEP_USER_ADMIN_APPS,
|
||||
GNUSTEP_USER_ADMIN_TOOLS): Set these variables.
|
||||
|
||||
* filesystem.make.in: Fixed typo in definition of
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS.
|
||||
|
||||
2007-03-05 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.ac, config.make.in: Add check for latex2html
|
||||
|
|
|
|||
|
|
@ -24,8 +24,9 @@ GNUSTEP_DEFAULT_PREFIX=/usr/local
|
|||
# paths.
|
||||
GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles
|
||||
|
||||
GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Applications
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Applications
|
||||
GNUSTEP_SYSTEM_WEB_APPS=/lib/GNUstep/WebApplications
|
||||
GNUSTEP_SYSTEM_TOOLS=/bin
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
|
||||
|
|
@ -35,8 +36,9 @@ GNUSTEP_SYSTEM_DOC=/share/GNUstep/Documentation
|
|||
GNUSTEP_SYSTEM_DOC_MAN=/man
|
||||
GNUSTEP_SYSTEM_DOC_INFO=/info
|
||||
|
||||
GNUSTEP_NETWORK_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_NETWORK_APPS=/lib/GNUstep/Applications
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/lib/GNUstep/Applications
|
||||
GNUSTEP_NETWORK_WEB_APPS=/lib/GNUstep/WebApplications
|
||||
GNUSTEP_NETWORK_TOOLS=/bin
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_NETWORK_LIBRARY=/lib/GNUstep
|
||||
|
|
@ -46,8 +48,9 @@ GNUSTEP_NETWORK_DOC=/share/GNUstep/Documentation
|
|||
GNUSTEP_NETWORK_DOC_MAN=/man
|
||||
GNUSTEP_NETWORK_DOC_INFO=/info
|
||||
|
||||
GNUSTEP_LOCAL_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_LOCAL_APPS=/lib/GNUstep/Applications
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/lib/GNUstep/Applications
|
||||
GNUSTEP_LOCAL_WEB_APPS=/lib/GNUstep/WebApplications
|
||||
GNUSTEP_LOCAL_TOOLS=/bin
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_LOCAL_LIBRARY=/lib/GNUstep
|
||||
|
|
@ -59,6 +62,7 @@ GNUSTEP_LOCAL_DOC_INFO=/info
|
|||
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ GNUSTEP_MAKEFILES=/System/Library/Makefiles
|
|||
|
||||
GNUSTEP_SYSTEM_APPS=/System/Applications
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/System/Applications/Admin
|
||||
GNUSTEP_SYSTEM_WEB_APPS=/System/Library/WebApplications
|
||||
GNUSTEP_SYSTEM_TOOLS=/System/Tools
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/System/Tools/Admin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/System/Library
|
||||
|
|
@ -46,6 +47,7 @@ GNUSTEP_SYSTEM_DOC_INFO=/System/Library/Documentation/info
|
|||
|
||||
GNUSTEP_LOCAL_APPS=/Local/Applications
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
|
||||
GNUSTEP_LOCAL_WEB_APPS=/Local/Library/WebApplications
|
||||
GNUSTEP_LOCAL_TOOLS=/Local/Tools
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=/Local/Tools/Admin
|
||||
GNUSTEP_LOCAL_LIBRARY=/Local/Library
|
||||
|
|
@ -57,6 +59,7 @@ GNUSTEP_LOCAL_DOC_INFO=/Local/Library/Documentation/info
|
|||
|
||||
GNUSTEP_NETWORK_APPS=/Local/Applications
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/Local/Applications/Admin
|
||||
GNUSTEP_NETWORK_WEB_APPS=/Local/Library/WebApplications
|
||||
GNUSTEP_NETWORK_TOOLS=/Local/Tools
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/Local/Tools/Admin
|
||||
GNUSTEP_NETWORK_LIBRARY=/Local/Library
|
||||
|
|
@ -68,6 +71,7 @@ GNUSTEP_NETWORK_DOC_INFO=/Local/Library/Documentation/info
|
|||
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_WEB_APPS=GNUstep/Library/WebApplications
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ GNUSTEP_MAKEFILES=/System/Library/Makefiles
|
|||
|
||||
GNUSTEP_SYSTEM_APPS=/System/Applications
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/System/Applications/Admin
|
||||
GNUSTEP_SYSTEM_WEB_APPS=/System/Library/WebApplications
|
||||
GNUSTEP_SYSTEM_TOOLS=/System/Tools
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/System/Tools/Admin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/System/Library
|
||||
|
|
@ -38,19 +39,9 @@ GNUSTEP_SYSTEM_DOC=/System/Library/Documentation
|
|||
GNUSTEP_SYSTEM_DOC_MAN=/System/Library/Documentation/man
|
||||
GNUSTEP_SYSTEM_DOC_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
|
||||
GNUSTEP_LOCAL_DOC=/Local/Library/Documentation
|
||||
GNUSTEP_LOCAL_DOC_MAN=/Local/Library/Documentation/man
|
||||
GNUSTEP_LOCAL_DOC_INFO=/Local/Library/Documentation/info
|
||||
|
||||
GNUSTEP_NETWORK_APPS=/Network/Applications
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/Network/Applications/Admin
|
||||
GNUSTEP_NETWORK_WEB_APPS=/Network/Library/WebApplications
|
||||
GNUSTEP_NETWORK_TOOLS=/Network/Tools
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/Network/Tools/Admin
|
||||
GNUSTEP_NETWORK_LIBRARY=/Network/Library
|
||||
|
|
@ -60,8 +51,21 @@ GNUSTEP_NETWORK_DOC=/Network/Library/Documentation
|
|||
GNUSTEP_NETWORK_DOC_MAN=/Network/Library/Documentation/man
|
||||
GNUSTEP_NETWORK_DOC_INFO=/Network/Library/Documentation/info
|
||||
|
||||
GNUSTEP_LOCAL_APPS=/Local/Applications
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
|
||||
GNUSTEP_LOCAL_WEB_APPS=/Local/Library/WebApplications
|
||||
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
|
||||
GNUSTEP_LOCAL_DOC=/Local/Library/Documentation
|
||||
GNUSTEP_LOCAL_DOC_MAN=/Local/Library/Documentation/man
|
||||
GNUSTEP_LOCAL_DOC_INFO=/Local/Library/Documentation/info
|
||||
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_WEB_APPS=GNUstep/Library/WebApplications
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ GNUSTEP_MAKEFILES=/GNUDeveloper/Makefiles
|
|||
|
||||
GNUSTEP_SYSTEM_APPS=/GNUApps
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/GNUAdmin
|
||||
GNUSTEP_SYSTEM_WEB_APPS=/GNULibrary/WebApps
|
||||
GNUSTEP_SYSTEM_TOOLS=/bin
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/GNULibrary
|
||||
|
|
@ -26,6 +27,7 @@ GNUSTEP_SYSTEM_DOC_INFO=/GNULibrary/Documentation/info
|
|||
|
||||
GNUSTEP_NETWORK_APPS=/Network/Apps
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/Network/Admin
|
||||
GNUSTEP_NETWORK_WEB_APPS=/Network/WebApps
|
||||
GNUSTEP_NETWORK_TOOLS=/Network/bin
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/Network/sbin
|
||||
GNUSTEP_NETWORK_LIBRARY=/Network/Library
|
||||
|
|
@ -37,6 +39,7 @@ GNUSTEP_NETWORK_DOC_INFO=/Network/Library/Documentation/info
|
|||
|
||||
GNUSTEP_LOCAL_APPS=/LocalApps
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/LocalAdmin
|
||||
GNUSTEP_LOCAL_WEB_APPS=/LocalLibrary/WebApps
|
||||
GNUSTEP_LOCAL_TOOLS=/bin
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_LOCAL_LIBRARY=/LocalLibrary
|
||||
|
|
@ -48,6 +51,7 @@ GNUSTEP_LOCAL_DOC_INFO=/LocalLibrary/Documentation/info
|
|||
|
||||
GNUSTEP_USER_DIR_APPS=Apps
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=Admin
|
||||
GNUSTEP_USER_DIR_WEB_APPS=Library/WebApps
|
||||
GNUSTEP_USER_DIR_TOOLS=bin
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=sbin
|
||||
GNUSTEP_USER_DIR_LIBRARY=Library
|
||||
|
|
|
|||
|
|
@ -100,6 +100,7 @@ unset -f reset_path
|
|||
|
||||
unset GNUSTEP_SYSTEM_APPS
|
||||
unset GNUSTEP_SYSTEM_ADMIN_APPS
|
||||
unset GNUSTEP_SYSTEM_WEB_APPS
|
||||
unset GNUSTEP_SYSTEM_TOOLS
|
||||
unset GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
unset GNUSTEP_SYSTEM_LIBRARY
|
||||
|
|
@ -111,21 +112,9 @@ unset GNUSTEP_SYSTEM_DOC
|
|||
unset GNUSTEP_SYSTEM_DOC_MAN
|
||||
unset GNUSTEP_SYSTEM_DOC_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_RESOURCES
|
||||
unset GNUSTEP_LOCAL_JAVA
|
||||
unset GNUSTEP_LOCAL_DOC
|
||||
unset GNUSTEP_LOCAL_DOC_MAN
|
||||
unset GNUSTEP_LOCAL_DOC_INFO
|
||||
|
||||
unset GNUSTEP_NETWORK_APPS
|
||||
unset GNUSTEP_NETWORK_ADMIN_APPS
|
||||
unset GNUSTEP_NETWORK_WEB_APPS
|
||||
unset GNUSTEP_NETWORK_TOOLS
|
||||
unset GNUSTEP_NETWORK_ADMIN_TOOLS
|
||||
unset GNUSTEP_NETWORK_LIBRARY
|
||||
|
|
@ -137,8 +126,23 @@ unset GNUSTEP_NETWORK_DOC
|
|||
unset GNUSTEP_NETWORK_DOC_MAN
|
||||
unset GNUSTEP_NETWORK_DOC_INFO
|
||||
|
||||
unset GNUSTEP_LOCAL_APPS
|
||||
unset GNUSTEP_LOCAL_ADMIN_APPS
|
||||
unset GNUSTEP_LOCAL_WEB_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_RESOURCES
|
||||
unset GNUSTEP_LOCAL_JAVA
|
||||
unset GNUSTEP_LOCAL_DOC
|
||||
unset GNUSTEP_LOCAL_DOC_MAN
|
||||
unset GNUSTEP_LOCAL_DOC_INFO
|
||||
|
||||
unset GNUSTEP_USER_APPS
|
||||
unset GNUSTEP_USER_ADMIN_APPS
|
||||
unset GNUSTEP_USER_WEB_APPS
|
||||
unset GNUSTEP_USER_TOOLS
|
||||
unset GNUSTEP_USER_ADMIN_TOOLS
|
||||
unset GNUSTEP_USER_LIBRARY
|
||||
|
|
@ -154,6 +158,7 @@ unset GNUSTEP_USER_DOC_INFO
|
|||
# somewhere.
|
||||
unset GNUSTEP_USER_DIR_APPS
|
||||
unset GNUSTEP_USER_DIR_ADMIN_APPS
|
||||
unset GNUSTEP_USER_DIR_WEB_APPS
|
||||
unset GNUSTEP_USER_DIR_TOOLS
|
||||
unset GNUSTEP_USER_DIR_ADMIN_TOOLS
|
||||
unset GNUSTEP_USER_DIR_LIBRARY
|
||||
|
|
|
|||
|
|
@ -53,14 +53,19 @@ GNUSTEP_MAKEFILES=@GNUSTEP_MAKEFILES@
|
|||
|
||||
|
||||
# This is where System GUI Applications get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Apps.
|
||||
# Traditionally it is /usr/GNUstep/System/Applications.
|
||||
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.
|
||||
# Traditionally it is /usr/GNUstep/System/Applications/Admin.
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=@GNUSTEP_SYSTEM_ADMIN_APPS@
|
||||
|
||||
# This is where System Web Applications (GSWeb, SOPE) get
|
||||
# installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Library/WebApplications.
|
||||
GNUSTEP_SYSTEM_WEB_APPS=@GNUSTEP_SYSTEM_WEB_APPS@
|
||||
|
||||
# This is where System Command-Line Tools get installed.
|
||||
# Traditionally it is /usr/GNUstep/System/Tools.
|
||||
GNUSTEP_SYSTEM_TOOLS=@GNUSTEP_SYSTEM_TOOLS@
|
||||
|
|
@ -103,6 +108,7 @@ GNUSTEP_SYSTEM_DOC_INFO=@GNUSTEP_SYSTEM_DOC_INFO@
|
|||
|
||||
GNUSTEP_NETWORK_APPS=@GNUSTEP_NETWORK_APPS@
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=@GNUSTEP_NETWORK_ADMIN_APPS@
|
||||
GNUSTEP_NETWORK_WEB_APPS=@GNUSTEP_NETWORK_WEB_APPS@
|
||||
GNUSTEP_NETWORK_TOOLS=@GNUSTEP_NETWORK_TOOLS@
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=@GNUSTEP_NETWORK_ADMIN_TOOLS@
|
||||
GNUSTEP_NETWORK_LIBRARY=@GNUSTEP_NETWORK_LIBRARY@
|
||||
|
|
@ -114,6 +120,7 @@ GNUSTEP_NETWORK_DOC_INFO=@GNUSTEP_NETWORK_DOC_INFO@
|
|||
|
||||
GNUSTEP_LOCAL_APPS=@GNUSTEP_LOCAL_APPS@
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=@GNUSTEP_LOCAL_ADMIN_APPS@
|
||||
GNUSTEP_LOCAL_WEB_APPS=@GNUSTEP_LOCAL_WEB_APPS@
|
||||
GNUSTEP_LOCAL_TOOLS=@GNUSTEP_LOCAL_TOOLS@
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=@GNUSTEP_LOCAL_ADMIN_TOOLS@
|
||||
GNUSTEP_LOCAL_LIBRARY=@GNUSTEP_LOCAL_LIBRARY@
|
||||
|
|
@ -130,6 +137,7 @@ GNUSTEP_LOCAL_DOC_INFO=@GNUSTEP_LOCAL_DOC_INFO@
|
|||
# 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_WEB_APPS=@GNUSTEP_USER_DIR_WEB_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@
|
||||
|
|
|
|||
|
|
@ -405,24 +405,25 @@ 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_ADMIN_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
export GNUSTEP_SYSTEM_APPS GNUSTEP_SYSTEM_ADMIN_APPS GNUSTEP_SYSTEM_WEB_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
export GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES
|
||||
export GNUSTEP_SYSTEM_DOC GNUSTEP_SYSTEM_DOC_MAN GNUSTEP_SYSTEM_DOC_INFO
|
||||
|
||||
export GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_ADMIN_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_ADMIN_TOOLS
|
||||
export GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_ADMIN_APPS GNUSTEP_NETWORK_WEB_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_ADMIN_TOOLS
|
||||
export GNUSTEP_NETWORK_LIBRARY GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES
|
||||
export GNUSTEP_NETWORK_DOC GNUSTEP_NETWORK_DOC_MAN GNUSTEP_NETWORK_DOC_INFO
|
||||
|
||||
export GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_ADMIN_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_ADMIN_TOOLS
|
||||
export GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_ADMIN_APPS GNUSTEP_LOCAL_WEB_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_ADMIN_TOOLS
|
||||
export GNUSTEP_LOCAL_LIBRARY GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES
|
||||
export GNUSTEP_LOCAL_DOC GNUSTEP_LOCAL_DOC_MAN GNUSTEP_LOCAL_DOC_INFO
|
||||
|
||||
export GNUSTEP_USER_APPS GNUSTEP_USER_ADMIN_APPS GNUSTEP_USER_TOOLS GNUSTEP_USER_ADMIN_TOOLS
|
||||
export GNUSTEP_USER_APPS GNUSTEP_USER_ADMIN_APPS GNUSTEP_USER_WEB_APPS GNUSTEP_USER_TOOLS GNUSTEP_USER_ADMIN_TOOLS
|
||||
export GNUSTEP_USER_LIBRARY GNUSTEP_USER_HEADERS GNUSTEP_USER_LIBRARIES
|
||||
export GNUSTEP_USER_DOC GNUSTEP_USER_DOC_MAN GNUSTEP_USER_DOC_INFO
|
||||
else
|
||||
unset GNUSTEP_SYSTEM_APPS
|
||||
unset GNUSTEP_SYSTEM_ADMIN_APPS
|
||||
unset GNUSTEP_SYSTEM_WEB_APPS
|
||||
unset GNUSTEP_SYSTEM_TOOLS
|
||||
unset GNUSTEP_SYSTEM_ADMIN_TOOLS
|
||||
unset GNUSTEP_SYSTEM_LIBRARY
|
||||
|
|
@ -434,6 +435,7 @@ else
|
|||
|
||||
unset GNUSTEP_NETWORK_APPS
|
||||
unset GNUSTEP_NETWORK_ADMIN_APPS
|
||||
unset GNUSTEP_NETWORK_WEB_APPS
|
||||
unset GNUSTEP_NETWORK_TOOLS
|
||||
unset GNUSTEP_NETWORK_ADMIN_TOOLS
|
||||
unset GNUSTEP_NETWORK_LIBRARY
|
||||
|
|
@ -445,6 +447,7 @@ else
|
|||
|
||||
unset GNUSTEP_LOCAL_APPS
|
||||
unset GNUSTEP_LOCAL_ADMIN_APPS
|
||||
unset GNUSTEP_LOCAL_WEB_APPS
|
||||
unset GNUSTEP_LOCAL_TOOLS
|
||||
unset GNUSTEP_LOCAL_ADMIN_TOOLS
|
||||
unset GNUSTEP_LOCAL_LIBRARY
|
||||
|
|
@ -456,6 +459,7 @@ else
|
|||
|
||||
unset GNUSTEP_USER_APPS
|
||||
unset GNUSTEP_USER_ADMIN_APPS
|
||||
unset GNUSTEP_USER_WEB_APPS
|
||||
unset GNUSTEP_USER_TOOLS
|
||||
unset GNUSTEP_USER_ADMIN_TOOLS
|
||||
unset GNUSTEP_USER_LIBRARY
|
||||
|
|
|
|||
|
|
@ -47,27 +47,24 @@ endif
|
|||
# Determine the application directory extension
|
||||
GSWAPP_EXTENSION = gswa
|
||||
|
||||
# FIXME: This is how it is ...
|
||||
GNUSTEP_GSWAPPS = $(GNUSTEP_INSTALLATION_DIR)/GSWApps
|
||||
|
||||
# ... and this is how it should be. It looks like changing this might
|
||||
# require changing gsweb though ? So I'm not doing it.
|
||||
# GNUSTEP_GSWAPPS = $(GNUSTEP_LIBRARY)/GSWApps
|
||||
|
||||
.PHONY: internal-gswapp-all_ \
|
||||
internal-gswapp-install_ \
|
||||
internal-gswapp-uninstall_ \
|
||||
internal-gswapp-copy_into_dir
|
||||
|
||||
# Defined (5 March 2007) for backwards compatibility in case your
|
||||
# GNUmakefiles used it -- will be removed any time from 5 March 2011.
|
||||
GNUSTEP_GSWAPPS = $(GNUSTEP_WEB_APPS)
|
||||
|
||||
#
|
||||
# Determine where to install. By default, install into GNUSTEP_GSWAPPS.
|
||||
# Determine where to install. By default, install into GNUSTEP_WEB_APPS.
|
||||
#
|
||||
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_DIR),)
|
||||
GSWAPP_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_INSTALL_DIR)
|
||||
endif
|
||||
|
||||
ifeq ($(GSWAPP_INSTALL_DIR),)
|
||||
GSWAPP_INSTALL_DIR = $(GNUSTEP_GSWAPPS)
|
||||
GSWAPP_INSTALL_DIR = $(GNUSTEP_WEB_APPS)
|
||||
endif
|
||||
|
||||
# Libraries that go before the WO libraries
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ 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_WEB_APPS = $(GNUSTEP_INSTALLATION_DIR)/Library/WebApplications
|
||||
GNUSTEP_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools
|
||||
GNUSTEP_ADMIN_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools/Admin
|
||||
GNUSTEP_LIBRARY = $(GNUSTEP_INSTALLATION_DIR)/Library
|
||||
|
|
@ -226,6 +227,7 @@ else
|
|||
|
||||
GNUSTEP_APPS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_APPS)
|
||||
GNUSTEP_ADMIN_APPS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_ADMIN_APPS)
|
||||
GNUSTEP_WEB_APPS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_WEB_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)
|
||||
|
|
|
|||
13
configure
vendored
13
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_APPS GNUSTEP_SYSTEM_ADMIN_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_ADMIN_TOOLS GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES GNUSTEP_SYSTEM_DOC GNUSTEP_SYSTEM_DOC_MAN GNUSTEP_SYSTEM_DOC_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_DOC GNUSTEP_NETWORK_DOC_MAN GNUSTEP_NETWORK_DOC_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_DOC GNUSTEP_LOCAL_DOC_MAN GNUSTEP_LOCAL_DOC_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_DOC GNUSTEP_USER_DIR_DOC_MAN GNUSTEP_USER_DIR_DOC_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 LATEX2HTML 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_WEB_APPS GNUSTEP_SYSTEM_TOOLS GNUSTEP_SYSTEM_ADMIN_TOOLS GNUSTEP_SYSTEM_LIBRARY GNUSTEP_SYSTEM_HEADERS GNUSTEP_SYSTEM_LIBRARIES GNUSTEP_SYSTEM_DOC GNUSTEP_SYSTEM_DOC_MAN GNUSTEP_SYSTEM_DOC_INFO GNUSTEP_NETWORK_APPS GNUSTEP_NETWORK_ADMIN_APPS GNUSTEP_NETWORK_WEB_APPS GNUSTEP_NETWORK_TOOLS GNUSTEP_NETWORK_ADMIN_TOOLS GNUSTEP_NETWORK_LIBRARY GNUSTEP_NETWORK_HEADERS GNUSTEP_NETWORK_LIBRARIES GNUSTEP_NETWORK_DOC GNUSTEP_NETWORK_DOC_MAN GNUSTEP_NETWORK_DOC_INFO GNUSTEP_LOCAL_APPS GNUSTEP_LOCAL_ADMIN_APPS GNUSTEP_LOCAL_WEB_APPS GNUSTEP_LOCAL_TOOLS GNUSTEP_LOCAL_ADMIN_TOOLS GNUSTEP_LOCAL_LIBRARY GNUSTEP_LOCAL_HEADERS GNUSTEP_LOCAL_LIBRARIES GNUSTEP_LOCAL_DOC GNUSTEP_LOCAL_DOC_MAN GNUSTEP_LOCAL_DOC_INFO GNUSTEP_USER_DIR_APPS GNUSTEP_USER_DIR_ADMIN_APPS GNUSTEP_USER_DIR_WEB_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_DOC GNUSTEP_USER_DIR_DOC_MAN GNUSTEP_USER_DIR_DOC_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 LATEX2HTML LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -3410,6 +3410,7 @@ 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_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_WEB_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"
|
||||
|
|
@ -3421,6 +3422,7 @@ GNUSTEP_SYSTEM_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOC_INFO"
|
|||
|
||||
GNUSTEP_NETWORK_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_APPS"
|
||||
GNUSTEP_NETWORK_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_APPS"
|
||||
GNUSTEP_NETWORK_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_WEB_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"
|
||||
|
|
@ -3432,6 +3434,7 @@ GNUSTEP_NETWORK_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOC_INFO"
|
|||
|
||||
GNUSTEP_LOCAL_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_APPS"
|
||||
GNUSTEP_LOCAL_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_APPS"
|
||||
GNUSTEP_LOCAL_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_WEB_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"
|
||||
|
|
@ -3788,6 +3791,10 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -5473,6 +5480,7 @@ s,@GNUSTEP_FLATTENED@,$GNUSTEP_FLATTENED,;t t
|
|||
s,@GNUSTEP_IS_FLATTENED@,$GNUSTEP_IS_FLATTENED,;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_WEB_APPS@,$GNUSTEP_SYSTEM_WEB_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
|
||||
|
|
@ -5483,6 +5491,7 @@ s,@GNUSTEP_SYSTEM_DOC_MAN@,$GNUSTEP_SYSTEM_DOC_MAN,;t t
|
|||
s,@GNUSTEP_SYSTEM_DOC_INFO@,$GNUSTEP_SYSTEM_DOC_INFO,;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_WEB_APPS@,$GNUSTEP_NETWORK_WEB_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
|
||||
|
|
@ -5493,6 +5502,7 @@ s,@GNUSTEP_NETWORK_DOC_MAN@,$GNUSTEP_NETWORK_DOC_MAN,;t t
|
|||
s,@GNUSTEP_NETWORK_DOC_INFO@,$GNUSTEP_NETWORK_DOC_INFO,;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_WEB_APPS@,$GNUSTEP_LOCAL_WEB_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
|
||||
|
|
@ -5503,6 +5513,7 @@ s,@GNUSTEP_LOCAL_DOC_MAN@,$GNUSTEP_LOCAL_DOC_MAN,;t t
|
|||
s,@GNUSTEP_LOCAL_DOC_INFO@,$GNUSTEP_LOCAL_DOC_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_WEB_APPS@,$GNUSTEP_USER_DIR_WEB_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
|
||||
|
|
|
|||
|
|
@ -300,6 +300,7 @@ 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_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_WEB_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"
|
||||
|
|
@ -311,6 +312,7 @@ GNUSTEP_SYSTEM_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOC_INFO"
|
|||
|
||||
GNUSTEP_NETWORK_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_APPS"
|
||||
GNUSTEP_NETWORK_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_APPS"
|
||||
GNUSTEP_NETWORK_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_WEB_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"
|
||||
|
|
@ -322,6 +324,7 @@ GNUSTEP_NETWORK_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOC_INFO"
|
|||
|
||||
GNUSTEP_LOCAL_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_APPS"
|
||||
GNUSTEP_LOCAL_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_APPS"
|
||||
GNUSTEP_LOCAL_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_WEB_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"
|
||||
|
|
@ -654,6 +657,7 @@ fi
|
|||
|
||||
AC_SUBST(GNUSTEP_SYSTEM_APPS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_ADMIN_APPS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_WEB_APPS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_TOOLS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_ADMIN_TOOLS)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_LIBRARY)
|
||||
|
|
@ -665,6 +669,7 @@ AC_SUBST(GNUSTEP_SYSTEM_DOC_INFO)
|
|||
|
||||
AC_SUBST(GNUSTEP_NETWORK_APPS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_ADMIN_APPS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_WEB_APPS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_TOOLS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_ADMIN_TOOLS)
|
||||
AC_SUBST(GNUSTEP_NETWORK_LIBRARY)
|
||||
|
|
@ -676,6 +681,7 @@ AC_SUBST(GNUSTEP_NETWORK_DOC_INFO)
|
|||
|
||||
AC_SUBST(GNUSTEP_LOCAL_APPS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_ADMIN_APPS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_WEB_APPS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_TOOLS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_ADMIN_TOOLS)
|
||||
AC_SUBST(GNUSTEP_LOCAL_LIBRARY)
|
||||
|
|
@ -687,6 +693,7 @@ AC_SUBST(GNUSTEP_LOCAL_DOC_INFO)
|
|||
|
||||
AC_SUBST(GNUSTEP_USER_DIR_APPS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_ADMIN_APPS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_WEB_APPS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_TOOLS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_ADMIN_TOOLS)
|
||||
AC_SUBST(GNUSTEP_USER_DIR_LIBRARY)
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ endif
|
|||
if ( ! ${?GNUSTEP_SYSTEM_ADMIN_APPS} ) then
|
||||
setenv GNUSTEP_SYSTEM_ADMIN_APPS "@GNUSTEP_SYSTEM_ADMIN_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_WEB_APPS} ) then
|
||||
setenv GNUSTEP_SYSTEM_WEB_APPS "@GNUSTEP_SYSTEM_WEB_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_SYSTEM_TOOLS} ) then
|
||||
setenv GNUSTEP_SYSTEM_TOOLS "@GNUSTEP_SYSTEM_TOOLS@"
|
||||
endif
|
||||
|
|
@ -63,40 +66,6 @@ if ( ! ${?GNUSTEP_SYSTEM_DOC_INFO} ) then
|
|||
setenv GNUSTEP_SYSTEM_DOC_INFO "@GNUSTEP_SYSTEM_DOC_INFO@"
|
||||
endif
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
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
|
||||
if ( ! ${?GNUSTEP_LOCAL_HEADERS} ) then
|
||||
setenv GNUSTEP_LOCAL_HEADERS "@GNUSTEP_LOCAL_HEADERS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_LIBRARIES} ) then
|
||||
setenv GNUSTEP_LOCAL_LIBRARIES "@GNUSTEP_LOCAL_LIBRARIES@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOC} ) then
|
||||
setenv GNUSTEP_LOCAL_DOC "@GNUSTEP_LOCAL_DOC@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOC_MAN} ) then
|
||||
setenv GNUSTEP_LOCAL_DOC_MAN "@GNUSTEP_LOCAL_DOC_MAN@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOC_INFO} ) then
|
||||
setenv GNUSTEP_LOCAL_DOC_INFO "@GNUSTEP_LOCAL_DOC_INFO@"
|
||||
endif
|
||||
|
||||
#
|
||||
# NETWORK domain
|
||||
#
|
||||
|
|
@ -106,6 +75,9 @@ endif
|
|||
if ( ! ${?GNUSTEP_NETWORK_ADMIN_APPS} ) then
|
||||
setenv GNUSTEP_NETWORK_ADMIN_APPS "@GNUSTEP_NETWORK_ADMIN_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_WEB_APPS} ) then
|
||||
setenv GNUSTEP_NETWORK_WEB_APPS "@GNUSTEP_NETWORK_WEB_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_NETWORK_TOOLS} ) then
|
||||
setenv GNUSTEP_NETWORK_TOOLS "@GNUSTEP_NETWORK_TOOLS@"
|
||||
endif
|
||||
|
|
@ -131,6 +103,43 @@ if ( ! ${?GNUSTEP_NETWORK_DOC_INFO} ) then
|
|||
setenv GNUSTEP_NETWORK_DOC_INFO "@GNUSTEP_NETWORK_DOC_INFO@"
|
||||
endif
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
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_WEB_APPS} ) then
|
||||
setenv GNUSTEP_LOCAL_WEB_APPS "@GNUSTEP_LOCAL_WEB_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
|
||||
if ( ! ${?GNUSTEP_LOCAL_HEADERS} ) then
|
||||
setenv GNUSTEP_LOCAL_HEADERS "@GNUSTEP_LOCAL_HEADERS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_LIBRARIES} ) then
|
||||
setenv GNUSTEP_LOCAL_LIBRARIES "@GNUSTEP_LOCAL_LIBRARIES@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOC} ) then
|
||||
setenv GNUSTEP_LOCAL_DOC "@GNUSTEP_LOCAL_DOC@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOC_MAN} ) then
|
||||
setenv GNUSTEP_LOCAL_DOC_MAN "@GNUSTEP_LOCAL_DOC_MAN@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_LOCAL_DOC_INFO} ) then
|
||||
setenv GNUSTEP_LOCAL_DOC_INFO "@GNUSTEP_LOCAL_DOC_INFO@"
|
||||
endif
|
||||
|
||||
#
|
||||
# USER domain
|
||||
#
|
||||
|
|
@ -140,6 +149,9 @@ endif
|
|||
if ( ! ${?GNUSTEP_USER_DIR_ADMIN_APPS} ) then
|
||||
setenv GNUSTEP_USER_DIR_ADMIN_APPS "@GNUSTEP_USER_DIR_ADMIN_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_WEB_APPS} ) then
|
||||
setenv GNUSTEP_USER_DIR_WEB_APPS "@GNUSTEP_USER_DIR_WEB_APPS@"
|
||||
endif
|
||||
if ( ! ${?GNUSTEP_USER_DIR_TOOLS} ) then
|
||||
setenv GNUSTEP_USER_DIR_TOOLS "@GNUSTEP_USER_DIR_TOOLS@"
|
||||
endif
|
||||
|
|
@ -183,6 +195,15 @@ switch ("${GNUSTEP_USER_DIR_ADMIN_APPS}")
|
|||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_WEB_APPS}")
|
||||
case /*: # An absolute path
|
||||
setenv GNUSTEP_USER_WEB_APPS "${GNUSTEP_USER_DIR_WEB_APPS}"
|
||||
breaksw
|
||||
default: # Something else
|
||||
setenv GNUSTEP_USER_WEB_APPS "${GNUSTEP_HOME}/${GNUSTEP_USER_DIR_WEB_APPS}"
|
||||
breaksw
|
||||
endsw
|
||||
|
||||
switch ("${GNUSTEP_USER_DIR_TOOLS}")
|
||||
case /*:
|
||||
setenv GNUSTEP_USER_TOOLS "${GNUSTEP_USER_DIR_TOOLS}"
|
||||
|
|
@ -257,6 +278,7 @@ endsw
|
|||
|
||||
unsetenv GNUSTEP_USER_DIR_APPS
|
||||
unsetenv GNUSTEP_USER_DIR_ADMIN_APPS
|
||||
unsetenv GNUSTEP_USER_DIR_WEB_APPS
|
||||
unsetenv GNUSTEP_USER_DIR_TOOLS
|
||||
unsetenv GNUSTEP_USER_DIR_ADMIN_TOOLS
|
||||
unsetenv GNUSTEP_USER_DIR_LIBRARY
|
||||
|
|
|
|||
|
|
@ -48,7 +48,8 @@
|
|||
# SYSTEM domain
|
||||
#
|
||||
GNUSTEP_SYSTEM_APPS ?= @GNUSTEP_SYSTEM_APPS@
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS ?= @GNUSTEP_SYSTEM_ADMIN_APPS@
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS ?= @GNUSTEP_SYSTEM_ADMIN_APPS@
|
||||
GNUSTEP_SYSTEM_WEB_APPS ?= @GNUSTEP_SYSTEM_WEB_APPS@
|
||||
GNUSTEP_SYSTEM_TOOLS ?= @GNUSTEP_SYSTEM_TOOLS@
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS ?= @GNUSTEP_SYSTEM_ADMIN_TOOLS@
|
||||
GNUSTEP_SYSTEM_LIBRARY ?= @GNUSTEP_SYSTEM_LIBRARY@
|
||||
|
|
@ -69,39 +70,12 @@ GNUSTEP_SYSTEM_SERVICES = $(GNUSTEP_SYSTEM_LIBRARY)/Services
|
|||
GNUSTEP_SYSTEM_RESOURCES = $(GNUSTEP_SYSTEM_LIBRARY)/Libraries/Resources
|
||||
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@
|
||||
GNUSTEP_LOCAL_DOC ?= @GNUSTEP_LOCAL_DOC@
|
||||
GNUSTEP_LOCAL_DOC_MAN ?= @GNUSTEP_LOCAL_DOC_MAN@
|
||||
GNUSTEP_LOCAL_DOC_INFO ?= @GNUSTEP_LOCAL_DOC_INFO@
|
||||
|
||||
#
|
||||
# LOCAL domain, variables that are fixed to subdirs of LIBRARY
|
||||
#
|
||||
GNUSTEP_LOCAL_APPLICATION_SUPPORT = $(GNUSTEP_LOCAL_LIBRARY)/ApplicationSupport
|
||||
GNUSTEP_LOCAL_BUNDLES = $(GNUSTEP_LOCAL_LIBRARY)/Bundles
|
||||
GNUSTEP_LOCAL_FRAMEWORKS = $(GNUSTEP_LOCAL_LIBRARY)/Frameworks
|
||||
GNUSTEP_LOCAL_PALETTES = $(GNUSTEP_LOCAL_LIBRARY)/ApplicationSupport/Palettes
|
||||
GNUSTEP_LOCAL_SERVICES = $(GNUSTEP_LOCAL_LIBRARY)/Services
|
||||
GNUSTEP_LOCAL_RESOURCES = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Resources
|
||||
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_WEB_APPS ?= @GNUSTEP_NETWORK_WEB_APPS@
|
||||
GNUSTEP_NETWORK_TOOLS ?= @GNUSTEP_NETWORK_TOOLS@
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS ?= @GNUSTEP_NETWORK_ADMIN_TOOLS@
|
||||
GNUSTEP_NETWORK_LIBRARY ?= @GNUSTEP_NETWORK_LIBRARY@
|
||||
|
|
@ -123,6 +97,33 @@ GNUSTEP_NETWORK_RESOURCES = $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Reso
|
|||
GNUSTEP_NETWORK_JAVA = $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Java
|
||||
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
GNUSTEP_LOCAL_APPS ?= @GNUSTEP_LOCAL_APPS@
|
||||
GNUSTEP_LOCAL_ADMIN_APPS ?= @GNUSTEP_LOCAL_ADMIN_APPS@
|
||||
GNUSTEP_LOCAL_WEB_APPS ?= @GNUSTEP_LOCAL_WEB_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@
|
||||
GNUSTEP_LOCAL_DOC ?= @GNUSTEP_LOCAL_DOC@
|
||||
GNUSTEP_LOCAL_DOC_MAN ?= @GNUSTEP_LOCAL_DOC_MAN@
|
||||
GNUSTEP_LOCAL_DOC_INFO ?= @GNUSTEP_LOCAL_DOC_INFO@
|
||||
|
||||
#
|
||||
# LOCAL domain, variables that are fixed to subdirs of LIBRARY
|
||||
#
|
||||
GNUSTEP_LOCAL_APPLICATION_SUPPORT = $(GNUSTEP_LOCAL_LIBRARY)/ApplicationSupport
|
||||
GNUSTEP_LOCAL_BUNDLES = $(GNUSTEP_LOCAL_LIBRARY)/Bundles
|
||||
GNUSTEP_LOCAL_FRAMEWORKS = $(GNUSTEP_LOCAL_LIBRARY)/Frameworks
|
||||
GNUSTEP_LOCAL_PALETTES = $(GNUSTEP_LOCAL_LIBRARY)/ApplicationSupport/Palettes
|
||||
GNUSTEP_LOCAL_SERVICES = $(GNUSTEP_LOCAL_LIBRARY)/Services
|
||||
GNUSTEP_LOCAL_RESOURCES = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Resources
|
||||
GNUSTEP_LOCAL_JAVA = $(GNUSTEP_LOCAL_LIBRARY)/Libraries/Java
|
||||
|
||||
|
||||
#
|
||||
# USER domain
|
||||
# Please note that here the GNUstep.conf values are called GNUSTEP_USER_DIR_*
|
||||
|
|
@ -131,8 +132,9 @@ GNUSTEP_NETWORK_JAVA = $(GNUSTEP_NETWORK_LIBRARY)/Libraries/Java
|
|||
#
|
||||
GNUSTEP_USER_DIR_APPS ?= @GNUSTEP_USER_DIR_APPS@
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS ?= @GNUSTEP_USER_DIR_ADMIN_APPS@
|
||||
GNUSTEP_USER_DIR_WEB_APPS ?= @GNUSTEP_USER_DIR_WEB_APPS@
|
||||
GNUSTEP_USER_DIR_TOOLS ?= @GNUSTEP_USER_DIR_TOOLS@
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS ?= @GNUSTEP_USER_DIR_ADMIN_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@
|
||||
|
|
@ -151,12 +153,34 @@ else
|
|||
GNUSTEP_USER_APPS = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_APPS)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_ADMIN_APPS)),)
|
||||
# Path starts with '/', so we can use it as it is
|
||||
GNUSTEP_USER_ADMIN_APPS = $(GNUSTEP_USER_DIR_ADMIN_APPS)
|
||||
else
|
||||
# Path does no start with '/', consider it as relative to GNUSTEP_HOME
|
||||
GNUSTEP_USER_ADMIN_APPS = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_ADMIN_APPS)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_WEB_APPS)),)
|
||||
# Path starts with '/', so we can use it as it is
|
||||
GNUSTEP_USER_WEB_APPS = $(GNUSTEP_USER_DIR_WEB_APPS)
|
||||
else
|
||||
# Path does no start with '/', consider it as relative to GNUSTEP_HOME
|
||||
GNUSTEP_USER_WEB_APPS = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_WEB_APPS)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_TOOLS)),)
|
||||
GNUSTEP_USER_TOOLS = $(GNUSTEP_USER_DIR_TOOLS)
|
||||
else
|
||||
GNUSTEP_USER_TOOLS = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_TOOLS)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_ADMIN_TOOLS)),)
|
||||
GNUSTEP_USER_ADMIN_TOOLS = $(GNUSTEP_USER_DIR_ADMIN_TOOLS)
|
||||
else
|
||||
GNUSTEP_USER_ADMIN_TOOLS = $(GNUSTEP_HOME)/$(GNUSTEP_USER_DIR_ADMIN_TOOLS)
|
||||
endif
|
||||
|
||||
ifneq ($(filter /%, $(GNUSTEP_USER_DIR_LIBRARY)),)
|
||||
GNUSTEP_USER_LIBRARY = $(GNUSTEP_USER_DIR_LIBRARY)
|
||||
else
|
||||
|
|
|
|||
|
|
@ -52,6 +52,9 @@ fi
|
|||
if [ -z "$GNUSTEP_SYSTEM_ADMIN_APPS" ];
|
||||
then GNUSTEP_SYSTEM_ADMIN_APPS="@GNUSTEP_SYSTEM_ADMIN_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_WEB_APPS" ];
|
||||
then GNUSTEP_SYSTEM_WEB_APPS="@GNUSTEP_SYSTEM_WEB_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_SYSTEM_TOOLS" ];
|
||||
then GNUSTEP_SYSTEM_TOOLS="@GNUSTEP_SYSTEM_TOOLS@"
|
||||
fi
|
||||
|
|
@ -77,41 +80,6 @@ if [ -z "$GNUSTEP_SYSTEM_DOC_INFO" ];
|
|||
then GNUSTEP_SYSTEM_DOC_INFO="@GNUSTEP_SYSTEM_DOC_INFO@"
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
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
|
||||
if [ -z "$GNUSTEP_LOCAL_HEADERS" ];
|
||||
then GNUSTEP_LOCAL_HEADERS="@GNUSTEP_LOCAL_HEADERS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_LIBRARIES" ];
|
||||
then GNUSTEP_LOCAL_LIBRARIES="@GNUSTEP_LOCAL_LIBRARIES@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOC" ];
|
||||
then GNUSTEP_LOCAL_DOC="@GNUSTEP_LOCAL_DOC@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOC_MAN" ];
|
||||
then GNUSTEP_LOCAL_DOC_MAN="@GNUSTEP_LOCAL_DOC_MAN@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOC_INFO" ];
|
||||
then GNUSTEP_LOCAL_DOC_INFO="@GNUSTEP_LOCAL_DOC_INFO@"
|
||||
fi
|
||||
|
||||
#
|
||||
# NETWORK domain
|
||||
#
|
||||
|
|
@ -121,6 +89,9 @@ fi
|
|||
if [ -z "$GNUSTEP_NETWORK_ADMIN_APPS" ];
|
||||
then GNUSTEP_NETWORK_ADMIN_APPS="@GNUSTEP_NETWORK_ADMIN_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_WEB_APPS" ];
|
||||
then GNUSTEP_NETWORK_WEB_APPS="@GNUSTEP_NETWORK_WEB_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_NETWORK_TOOLS" ];
|
||||
then GNUSTEP_NETWORK_TOOLS="@GNUSTEP_NETWORK_TOOLS@"
|
||||
fi
|
||||
|
|
@ -146,6 +117,43 @@ if [ -z "$GNUSTEP_NETWORK_DOC_INFO" ];
|
|||
then GNUSTEP_NETWORK_DOC_INFO="@GNUSTEP_NETWORK_DOC_INFO@"
|
||||
fi
|
||||
|
||||
#
|
||||
# LOCAL domain
|
||||
#
|
||||
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_WEB_APPS" ];
|
||||
then GNUSTEP_LOCAL_WEB_APPS="@GNUSTEP_LOCAL_WEB_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
|
||||
if [ -z "$GNUSTEP_LOCAL_HEADERS" ];
|
||||
then GNUSTEP_LOCAL_HEADERS="@GNUSTEP_LOCAL_HEADERS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_LIBRARIES" ];
|
||||
then GNUSTEP_LOCAL_LIBRARIES="@GNUSTEP_LOCAL_LIBRARIES@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOC" ];
|
||||
then GNUSTEP_LOCAL_DOC="@GNUSTEP_LOCAL_DOC@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOC_MAN" ];
|
||||
then GNUSTEP_LOCAL_DOC_MAN="@GNUSTEP_LOCAL_DOC_MAN@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_LOCAL_DOC_INFO" ];
|
||||
then GNUSTEP_LOCAL_DOC_INFO="@GNUSTEP_LOCAL_DOC_INFO@"
|
||||
fi
|
||||
|
||||
#
|
||||
# USER domain
|
||||
#
|
||||
|
|
@ -155,6 +163,9 @@ 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_WEB_APPS" ];
|
||||
then GNUSTEP_USER_DIR_WEB_APPS="@GNUSTEP_USER_DIR_WEB_APPS@"
|
||||
fi
|
||||
if [ -z "$GNUSTEP_USER_DIR_TOOLS" ];
|
||||
then GNUSTEP_USER_DIR_TOOLS="@GNUSTEP_USER_DIR_TOOLS@"
|
||||
fi
|
||||
|
|
@ -200,6 +211,14 @@ case "$GNUSTEP_USER_DIR_ADMIN_APPS" in
|
|||
esac
|
||||
unset GNUSTEP_USER_DIR_ADMIN_APPS
|
||||
|
||||
case "$GNUSTEP_USER_DIR_WEB_APPS" in
|
||||
/*) # An absolute path
|
||||
GNUSTEP_USER_WEB_APPS="$GNUSTEP_USER_DIR_WEB_APPS";;
|
||||
*) # Something else
|
||||
GNUSTEP_USER_WEB_APPS="$GNUSTEP_HOME/$GNUSTEP_USER_DIR_WEB_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";;
|
||||
|
|
|
|||
Loading…
Reference in a new issue