Adding Gershwin filesystem layout and vars

Author: pkgdemon

FilesystemLayouts/gershwin

@@ -0,0 +1,88 @@
+#
+# Gershwin filesystem layout
+#
+# This is the layout for the Gershwin Desktop Environment. It is similar
+# to the GNUstep layout but with key differences to support packaging
+# and a client-server computing model.
+#
+# The prefix is designed to be the root of the filesystem while being
+# entirely self-contained. Each domain has distinct user directories
+# to distinguish between Local, Network, and System users.
+#
+# Tools are placed under Library (e.g., /System/Library/Tools) for
+# consistency across domains and to support installation of GNUstep
+# applications outside the operating system's packaging facilities.
+#
+# To use gnustep-make in this environment, source GNUstep.sh or use
+# 'export GNUSTEP_MAKEFILES=/System/Library/Makefiles'.
+#
+
+GNUSTEP_DEFAULT_PREFIX=/
+
+GNUSTEP_SYSTEM_USERS_DIR=/System/Users
+GNUSTEP_NETWORK_USERS_DIR=/Network/Users
+GNUSTEP_LOCAL_USERS_DIR=/Local/Users
+
+GNUSTEP_MAKEFILES=/System/Library/Makefiles
+
+GNUSTEP_SYSTEM_APPS=/System/Applications
+GNUSTEP_SYSTEM_ADMIN_APPS=/System/Applications/Admin
+GNUSTEP_SYSTEM_UTILITIES=/System/Applications/Utilities
+GNUSTEP_SYSTEM_WEB_APPS=/System/Library/WebApplications
+GNUSTEP_SYSTEM_TOOLS=/System/Library/Tools
+GNUSTEP_SYSTEM_ADMIN_TOOLS=/System/Library/Tools/Admin
+GNUSTEP_SYSTEM_LIBRARY=/System/Library
+GNUSTEP_SYSTEM_HEADERS=/System/Library/Headers
+GNUSTEP_SYSTEM_LIBRARIES=/System/Library/Libraries
+GNUSTEP_SYSTEM_DOC=/System/Library/Documentation
+GNUSTEP_SYSTEM_DOC_MAN=/System/Library/Documentation/man
+GNUSTEP_SYSTEM_DOC_INFO=/System/Library/Documentation/info
+GNUSTEP_SYSTEM_CORE_SERVICES=/System/Library/CoreServices
+GNUSTEP_SYSTEM_CORE_SERVICES_APPS=/System/Library/CoreServices/Applications
+
+GNUSTEP_NETWORK_APPS=/Network/Applications
+GNUSTEP_NETWORK_ADMIN_APPS=/Network/Applications/Admin
+GNUSTEP_NETWORK_UTILITIES=/Network/Applications/Utilities
+GNUSTEP_NETWORK_WEB_APPS=/Network/Library/WebApplications
+GNUSTEP_NETWORK_TOOLS=/Network/Library/Tools
+GNUSTEP_NETWORK_ADMIN_TOOLS=/Network/Library/Tools/Admin
+GNUSTEP_NETWORK_LIBRARY=/Network/Library
+GNUSTEP_NETWORK_HEADERS=/Network/Library/Headers
+GNUSTEP_NETWORK_LIBRARIES=/Network/Library/Libraries
+GNUSTEP_NETWORK_DOC=/Network/Library/Documentation
+GNUSTEP_NETWORK_DOC_MAN=/Network/Library/Documentation/man
+GNUSTEP_NETWORK_DOC_INFO=/Network/Library/Documentation/info
+GNUSTEP_NETWORK_CORE_SERVICES=/Network/Library/CoreServices
+GNUSTEP_NETWORK_CORE_SERVICES_APPS=/Network/Library/CoreServices/Applications
+
+GNUSTEP_LOCAL_APPS=/Local/Applications
+GNUSTEP_LOCAL_ADMIN_APPS=/Local/Applications/Admin
+GNUSTEP_LOCAL_UTILITIES=/Local/Applications/Utilities
+GNUSTEP_LOCAL_WEB_APPS=/Local/Library/WebApplications
+GNUSTEP_LOCAL_TOOLS=/Local/Library/Tools
+GNUSTEP_LOCAL_ADMIN_TOOLS=/Local/Library/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_LOCAL_CORE_SERVICES=/Local/Library/CoreServices
+GNUSTEP_LOCAL_CORE_SERVICES_APPS=/Local/Library/CoreServices/Applications
+
+GNUSTEP_USER_DIR_APPS=Applications
+GNUSTEP_USER_DIR_ADMIN_APPS=Applications/Admin
+GNUSTEP_USER_DIR_UTILITIES=Applications/Utilities
+GNUSTEP_USER_DIR_WEB_APPS=Library/WebApplications
+GNUSTEP_USER_DIR_TOOLS=Library/Tools
+GNUSTEP_USER_DIR_ADMIN_TOOLS=Library/Tools/Admin
+GNUSTEP_USER_DIR_LIBRARY=Library
+GNUSTEP_USER_DIR_HEADERS=Library/Headers
+GNUSTEP_USER_DIR_LIBRARIES=Library/Libraries
+GNUSTEP_USER_DIR_DOC=Library/Documentation
+GNUSTEP_USER_DIR_DOC_MAN=Library/Documentation/man
+GNUSTEP_USER_DIR_DOC_INFO=Library/Documentation/info
+GNUSTEP_USER_DIR_CORE_SERVICES=Library/CoreServices
+GNUSTEP_USER_DIR_CORE_SERVICES_APPS=Library/CoreServices/Applications
+GNUSTEP_USER_CONFIG_FILE=Library/Preferences/GNUstep.conf
+GNUSTEP_USER_DEFAULTS_DIR=Library/Preferences

GNUstep-reset.sh.in

@@ -102,78 +102,93 @@ unset GNUSTEP_SYSTEM_USERS_DIR
 unset GNUSTEP_NETWORK_USERS_DIR
 unset GNUSTEP_LOCAL_USERS_DIR
 
-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_APPS
+unset GNUSTEP_SYSTEM_ADMIN_APPS
+unset GNUSTEP_SYSTEM_UTILITIES
+unset GNUSTEP_SYSTEM_WEB_APPS
+unset GNUSTEP_SYSTEM_TOOLS
+unset GNUSTEP_SYSTEM_ADMIN_TOOLS
 unset GNUSTEP_SYSTEM_LIBRARY
-unset GNUSTEP_SYSTEM_HEADERS 
-unset GNUSTEP_SYSTEM_LIBRARIES 
-unset GNUSTEP_SYSTEM_RESOURCES 
-unset GNUSTEP_SYSTEM_JAVA 
-unset GNUSTEP_SYSTEM_DOC 
+unset GNUSTEP_SYSTEM_HEADERS
+unset GNUSTEP_SYSTEM_LIBRARIES
+unset GNUSTEP_SYSTEM_RESOURCES
+unset GNUSTEP_SYSTEM_JAVA
+unset GNUSTEP_SYSTEM_DOC
 unset GNUSTEP_SYSTEM_DOC_MAN
 unset GNUSTEP_SYSTEM_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_SYSTEM_CORE_SERVICES
+unset GNUSTEP_SYSTEM_CORE_SERVICES_APPS
+
+unset GNUSTEP_NETWORK_APPS
+unset GNUSTEP_NETWORK_ADMIN_APPS
+unset GNUSTEP_NETWORK_UTILITIES
+unset GNUSTEP_NETWORK_WEB_APPS
+unset GNUSTEP_NETWORK_TOOLS
+unset GNUSTEP_NETWORK_ADMIN_TOOLS
 unset GNUSTEP_NETWORK_LIBRARY
-unset GNUSTEP_NETWORK_HEADERS 
-unset GNUSTEP_NETWORK_LIBRARIES 
-unset GNUSTEP_NETWORK_RESOURCES 
-unset GNUSTEP_NETWORK_JAVA 
-unset GNUSTEP_NETWORK_DOC 
+unset GNUSTEP_NETWORK_HEADERS
+unset GNUSTEP_NETWORK_LIBRARIES
+unset GNUSTEP_NETWORK_RESOURCES
+unset GNUSTEP_NETWORK_JAVA
+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_NETWORK_CORE_SERVICES
+unset GNUSTEP_NETWORK_CORE_SERVICES_APPS
+
+unset GNUSTEP_LOCAL_APPS
+unset GNUSTEP_LOCAL_ADMIN_APPS
+unset GNUSTEP_LOCAL_UTILITIES
+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_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_LOCAL_CORE_SERVICES
+unset GNUSTEP_LOCAL_CORE_SERVICES_APPS
 
-unset GNUSTEP_USER_APPS 
+unset GNUSTEP_USER_APPS
 unset GNUSTEP_USER_ADMIN_APPS
+unset GNUSTEP_USER_UTILITIES
 unset GNUSTEP_USER_WEB_APPS
-unset GNUSTEP_USER_TOOLS 
+unset GNUSTEP_USER_TOOLS
 unset GNUSTEP_USER_ADMIN_TOOLS
 unset GNUSTEP_USER_LIBRARY
-unset GNUSTEP_USER_HEADERS 
-unset GNUSTEP_USER_LIBRARIES 
-unset GNUSTEP_USER_RESOURCES 
-unset GNUSTEP_USER_JAVA 
-unset GNUSTEP_USER_DOC 
+unset GNUSTEP_USER_HEADERS
+unset GNUSTEP_USER_LIBRARIES
+unset GNUSTEP_USER_RESOURCES
+unset GNUSTEP_USER_JAVA
+unset GNUSTEP_USER_DOC
 unset GNUSTEP_USER_DOC_MAN
 unset GNUSTEP_USER_DOC_INFO
+unset GNUSTEP_USER_CORE_SERVICES
+unset GNUSTEP_USER_CORE_SERVICES_APPS
 
 # These should not defined, but might be if something goes wrong
 # somewhere.
 unset GNUSTEP_MAKE_STRICT_V2_MODE
-unset GNUSTEP_USER_DIR_APPS 
+unset GNUSTEP_USER_DIR_APPS
 unset GNUSTEP_USER_DIR_ADMIN_APPS
+unset GNUSTEP_USER_DIR_UTILITIES
 unset GNUSTEP_USER_DIR_WEB_APPS
-unset GNUSTEP_USER_DIR_TOOLS 
-unset GNUSTEP_USER_DIR_ADMIN_TOOLS 
+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 
-unset GNUSTEP_USER_DIR_RESOURCES 
-unset GNUSTEP_USER_DIR_JAVA 
-unset GNUSTEP_USER_DIR_DOC 
+unset GNUSTEP_USER_DIR_HEADERS
+unset GNUSTEP_USER_DIR_LIBRARIES
+unset GNUSTEP_USER_DIR_RESOURCES
+unset GNUSTEP_USER_DIR_JAVA
+unset GNUSTEP_USER_DIR_DOC
 unset GNUSTEP_USER_DIR_DOC_MAN
 unset GNUSTEP_USER_DIR_DOC_INFO
+unset GNUSTEP_USER_DIR_CORE_SERVICES
+unset GNUSTEP_USER_DIR_CORE_SERVICES_APPS
 
 unset GNUSTEP_PATHLIST
 unset GNUSTEP_USER_ROOT

GNUstep-strict-v2.conf.in

@@ -64,6 +64,9 @@ GNUSTEP_SYSTEM_APPS=@GNUSTEP_SYSTEM_APPS@
 # Traditionally it is /usr/GNUstep/System/Applications/Admin.
 GNUSTEP_SYSTEM_ADMIN_APPS=@GNUSTEP_SYSTEM_ADMIN_APPS@
 
+# This is where System GUI Utilities get installed.
+GNUSTEP_SYSTEM_UTILITIES=@GNUSTEP_SYSTEM_UTILITIES@
+
 # This is where System Web Applications (GSWeb, SOPE) get
 # installed.
 # Traditionally it is /usr/GNUstep/System/Library/WebApplications.
@@ -108,9 +111,16 @@ GNUSTEP_SYSTEM_DOC_MAN=@GNUSTEP_SYSTEM_DOC_MAN@
 # Traditionally it is /usr/GNUstep/System/Library/Documentation/info.
 GNUSTEP_SYSTEM_DOC_INFO=@GNUSTEP_SYSTEM_DOC_INFO@
 
+# This is where System CoreServices get installed.
+GNUSTEP_SYSTEM_CORE_SERVICES=@GNUSTEP_SYSTEM_CORE_SERVICES@
+
+# This is where System CoreServices Applications get installed.
+GNUSTEP_SYSTEM_CORE_SERVICES_APPS=@GNUSTEP_SYSTEM_CORE_SERVICES_APPS@
+
 
 GNUSTEP_NETWORK_APPS=@GNUSTEP_NETWORK_APPS@
 GNUSTEP_NETWORK_ADMIN_APPS=@GNUSTEP_NETWORK_ADMIN_APPS@
+GNUSTEP_NETWORK_UTILITIES=@GNUSTEP_NETWORK_UTILITIES@
 GNUSTEP_NETWORK_WEB_APPS=@GNUSTEP_NETWORK_WEB_APPS@
 GNUSTEP_NETWORK_TOOLS=@GNUSTEP_NETWORK_TOOLS@
 GNUSTEP_NETWORK_ADMIN_TOOLS=@GNUSTEP_NETWORK_ADMIN_TOOLS@
@@ -120,9 +130,12 @@ GNUSTEP_NETWORK_LIBRARIES=@GNUSTEP_NETWORK_LIBRARIES@
 GNUSTEP_NETWORK_DOC=@GNUSTEP_NETWORK_DOC@
 GNUSTEP_NETWORK_DOC_MAN=@GNUSTEP_NETWORK_DOC_MAN@
 GNUSTEP_NETWORK_DOC_INFO=@GNUSTEP_NETWORK_DOC_INFO@
+GNUSTEP_NETWORK_CORE_SERVICES=@GNUSTEP_NETWORK_CORE_SERVICES@
+GNUSTEP_NETWORK_CORE_SERVICES_APPS=@GNUSTEP_NETWORK_CORE_SERVICES_APPS@
 
 GNUSTEP_LOCAL_APPS=@GNUSTEP_LOCAL_APPS@
 GNUSTEP_LOCAL_ADMIN_APPS=@GNUSTEP_LOCAL_ADMIN_APPS@
+GNUSTEP_LOCAL_UTILITIES=@GNUSTEP_LOCAL_UTILITIES@
 GNUSTEP_LOCAL_WEB_APPS=@GNUSTEP_LOCAL_WEB_APPS@
 GNUSTEP_LOCAL_TOOLS=@GNUSTEP_LOCAL_TOOLS@
 GNUSTEP_LOCAL_ADMIN_TOOLS=@GNUSTEP_LOCAL_ADMIN_TOOLS@
@@ -132,6 +145,8 @@ 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@
+GNUSTEP_LOCAL_CORE_SERVICES=@GNUSTEP_LOCAL_CORE_SERVICES@
+GNUSTEP_LOCAL_CORE_SERVICES_APPS=@GNUSTEP_LOCAL_CORE_SERVICES_APPS@
 
 # Important: settings in the User should normally be relative paths,
 # and will be interpreted as relative to the user's directory.  This
@@ -140,6 +155,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_UTILITIES=@GNUSTEP_USER_DIR_UTILITIES@
 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@
@@ -149,3 +165,5 @@ GNUSTEP_USER_DIR_LIBRARIES=@GNUSTEP_USER_DIR_LIBRARIES@
 GNUSTEP_USER_DIR_DOC=@GNUSTEP_USER_DIR_DOC@
 GNUSTEP_USER_DIR_DOC_MAN=@GNUSTEP_USER_DIR_DOC_MAN@
 GNUSTEP_USER_DIR_DOC_INFO=@GNUSTEP_USER_DIR_DOC_INFO@
+GNUSTEP_USER_DIR_CORE_SERVICES=@GNUSTEP_USER_DIR_CORE_SERVICES@
+GNUSTEP_USER_DIR_CORE_SERVICES_APPS=@GNUSTEP_USER_DIR_CORE_SERVICES_APPS@

GNUstep.conf.in

@@ -67,6 +67,9 @@ GNUSTEP_SYSTEM_APPS=@GNUSTEP_SYSTEM_APPS@
 # Traditionally it is /usr/GNUstep/System/Applications/Admin.
 GNUSTEP_SYSTEM_ADMIN_APPS=@GNUSTEP_SYSTEM_ADMIN_APPS@
 
+# This is where System GUI Utilities get installed.
+GNUSTEP_SYSTEM_UTILITIES=@GNUSTEP_SYSTEM_UTILITIES@
+
 # This is where System Web Applications (GSWeb, SOPE) get
 # installed.
 # Traditionally it is /usr/GNUstep/System/Library/WebApplications.
@@ -111,9 +114,16 @@ GNUSTEP_SYSTEM_DOC_MAN=@GNUSTEP_SYSTEM_DOC_MAN@
 # Traditionally it is /usr/GNUstep/System/Library/Documentation/info.
 GNUSTEP_SYSTEM_DOC_INFO=@GNUSTEP_SYSTEM_DOC_INFO@
 
+# This is where System CoreServices get installed.
+GNUSTEP_SYSTEM_CORE_SERVICES=@GNUSTEP_SYSTEM_CORE_SERVICES@
+
+# This is where System CoreServices Applications get installed.
+GNUSTEP_SYSTEM_CORE_SERVICES_APPS=@GNUSTEP_SYSTEM_CORE_SERVICES_APPS@
+
 
 GNUSTEP_NETWORK_APPS=@GNUSTEP_NETWORK_APPS@
 GNUSTEP_NETWORK_ADMIN_APPS=@GNUSTEP_NETWORK_ADMIN_APPS@
+GNUSTEP_NETWORK_UTILITIES=@GNUSTEP_NETWORK_UTILITIES@
 GNUSTEP_NETWORK_WEB_APPS=@GNUSTEP_NETWORK_WEB_APPS@
 GNUSTEP_NETWORK_TOOLS=@GNUSTEP_NETWORK_TOOLS@
 GNUSTEP_NETWORK_ADMIN_TOOLS=@GNUSTEP_NETWORK_ADMIN_TOOLS@
@@ -123,9 +133,12 @@ GNUSTEP_NETWORK_LIBRARIES=@GNUSTEP_NETWORK_LIBRARIES@
 GNUSTEP_NETWORK_DOC=@GNUSTEP_NETWORK_DOC@
 GNUSTEP_NETWORK_DOC_MAN=@GNUSTEP_NETWORK_DOC_MAN@
 GNUSTEP_NETWORK_DOC_INFO=@GNUSTEP_NETWORK_DOC_INFO@
+GNUSTEP_NETWORK_CORE_SERVICES=@GNUSTEP_NETWORK_CORE_SERVICES@
+GNUSTEP_NETWORK_CORE_SERVICES_APPS=@GNUSTEP_NETWORK_CORE_SERVICES_APPS@
 
 GNUSTEP_LOCAL_APPS=@GNUSTEP_LOCAL_APPS@
 GNUSTEP_LOCAL_ADMIN_APPS=@GNUSTEP_LOCAL_ADMIN_APPS@
+GNUSTEP_LOCAL_UTILITIES=@GNUSTEP_LOCAL_UTILITIES@
 GNUSTEP_LOCAL_WEB_APPS=@GNUSTEP_LOCAL_WEB_APPS@
 GNUSTEP_LOCAL_TOOLS=@GNUSTEP_LOCAL_TOOLS@
 GNUSTEP_LOCAL_ADMIN_TOOLS=@GNUSTEP_LOCAL_ADMIN_TOOLS@
@@ -135,6 +148,8 @@ 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@
+GNUSTEP_LOCAL_CORE_SERVICES=@GNUSTEP_LOCAL_CORE_SERVICES@
+GNUSTEP_LOCAL_CORE_SERVICES_APPS=@GNUSTEP_LOCAL_CORE_SERVICES_APPS@
 
 # Important: settings in the User should normally be relative paths,
 # and will be interpreted as relative to the user's directory.  This
@@ -143,6 +158,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_UTILITIES=@GNUSTEP_USER_DIR_UTILITIES@
 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@
@@ -152,3 +168,5 @@ GNUSTEP_USER_DIR_LIBRARIES=@GNUSTEP_USER_DIR_LIBRARIES@
 GNUSTEP_USER_DIR_DOC=@GNUSTEP_USER_DIR_DOC@
 GNUSTEP_USER_DIR_DOC_MAN=@GNUSTEP_USER_DIR_DOC_MAN@
 GNUSTEP_USER_DIR_DOC_INFO=@GNUSTEP_USER_DIR_DOC_INFO@
+GNUSTEP_USER_DIR_CORE_SERVICES=@GNUSTEP_USER_DIR_CORE_SERVICES@
+GNUSTEP_USER_DIR_CORE_SERVICES_APPS=@GNUSTEP_USER_DIR_CORE_SERVICES_APPS@