|
Lines 84-90
Link Here
|
| 84 |
__GS_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT} |
84 |
__GS_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT} |
| 85 |
__GS_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT} |
85 |
__GS_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT} |
| 86 |
__GS_USER_ROOT=${GNUSTEP_USER_ROOT} |
86 |
__GS_USER_ROOT=${GNUSTEP_USER_ROOT} |
|
|
87 |
__GS_USER_DIR=${GNUSTEP_USER_DIR} |
| 88 |
__GS_USER_DEFAULTS_DIR=${GNUSTEP_USER_DEFAULTS_DIR} |
| 87 |
__GS_USER_ROOT_SUFFIX=$(dirname ${GNUSTEP_USER_ROOT#*$USER}/prune)/ |
89 |
__GS_USER_ROOT_SUFFIX=$(dirname ${GNUSTEP_USER_ROOT#*$USER}/prune)/ |
|
|
90 |
__GS_USER_DIR_SUFFIX=$(dirname ${GNUSTEP_USER_DIR#*$USER}/prune)/ |
| 91 |
__GS_USER_DEFAULTS_DIR_SUFFIX=$(dirname ${GNUSTEP_USER_DEFAULTS_DIR#*$USER}/prune)/ |
| 88 |
|
92 |
|
| 89 |
# "gs_prefix" is the prefix that GNUstep is installed into, e.g. |
93 |
# "gs_prefix" is the prefix that GNUstep is installed into, e.g. |
| 90 |
# gs_prefix=/usr/GNUstep => GNUSTEP_SYSTEM_ROOT=${gs_prefix}/System |
94 |
# gs_prefix=/usr/GNUstep => GNUSTEP_SYSTEM_ROOT=${gs_prefix}/System |
|
Lines 95-105
Link Here
|
| 95 |
# GNUSTEP_USER_ROOT and HOME, e.g.: |
99 |
# GNUSTEP_USER_ROOT and HOME, e.g.: |
| 96 |
# "/home/something/whatever/.config/GNUstep" => ".config/GNUstep" |
100 |
# "/home/something/whatever/.config/GNUstep" => ".config/GNUstep" |
| 97 |
echo ${__GS_USER_ROOT_SUFFIX//\//XXX_SED_FSLASH} > ${TMP}/sed.gs_user_root_suffix |
101 |
echo ${__GS_USER_ROOT_SUFFIX//\//XXX_SED_FSLASH} > ${TMP}/sed.gs_user_root_suffix |
|
|
102 |
echo ${__GS_USER_DIR_SUFFIX//\//XXX_SED_FSLASH} > ${TMP}/sed.gs_user_dir_suffix |
| 103 |
echo ${__GS_USER_DEFAULTS_DIR_SUFFIX//\//XXX_SED_FSLASH} > ${TMP}/sed.gs_user_defaults_dir_suffix |
| 98 |
|
104 |
|
| 99 |
# Set up common env vars for make operations |
105 |
# Set up common env vars for make operations |
| 100 |
__GS_MAKE_EVAL=" \ |
106 |
__GS_MAKE_EVAL=" \ |
| 101 |
HOME=\"\${T}\" \ |
107 |
HOME=\"\${T}\" \ |
| 102 |
GNUSTEP_USER_ROOT=\"\${T}\" \ |
108 |
GNUSTEP_USER_ROOT=\"\${T}\" \ |
|
|
109 |
GNUSTEP_USER_DIR=\"\${T}\" \ |
| 110 |
GNUSTEP_USER_DEFAULTS_DIR=\"\${T}\"/Defaults \ |
| 103 |
GNUSTEP_DEFAULTS_ROOT=\"\${T}/\${__GS_USER_ROOT_SUFFIX}\" \ |
111 |
GNUSTEP_DEFAULTS_ROOT=\"\${T}/\${__GS_USER_ROOT_SUFFIX}\" \ |
| 104 |
INSTALL_ROOT_DIR=\"\${D}\" \ |
112 |
INSTALL_ROOT_DIR=\"\${D}\" \ |
| 105 |
GNUSTEP_INSTALLATION_DIR=\"\${D}/\$(egnustep_install_domain)\" \ |
113 |
GNUSTEP_INSTALLATION_DIR=\"\${D}/\$(egnustep_install_domain)\" \ |
|
Lines 157-162
Link Here
|
| 157 |
echo ${!__GS_USER_ROOT_SUFFIX} |
165 |
echo ${!__GS_USER_ROOT_SUFFIX} |
| 158 |
} |
166 |
} |
| 159 |
|
167 |
|
|
|
168 |
# Get/Set the GNUstep user dir |
| 169 |
# Note: watch out for this one -- ~ and such must be enclosed in single-quotes when passed in |
| 170 |
egnustep_user_dir() { |
| 171 |
if [ "$1" ]; then |
| 172 |
__GS_USER_DIR="$(dirname $1/prune)" |
| 173 |
else |
| 174 |
echo ${__GS_USER_DIR} |
| 175 |
fi |
| 176 |
} |
| 177 |
|
| 178 |
# Print the "suffix" of the user_dir, or simply |
| 179 |
# e.g ~/GNUstep => GNUstep |
| 180 |
egnustep_user_dir_suffix() { |
| 181 |
echo ${!__GS_USER_DIR_SUFFIX} |
| 182 |
} |
| 183 |
|
| 184 |
# Get/Set the GNUstep user defaults dir |
| 185 |
# Note: watch out for this one -- ~ and such must be enclosed in single-quotes when passed in |
| 186 |
egnustep_user_defaults_dir() { |
| 187 |
if [ "$1" ]; then |
| 188 |
__GS_USER_DEFAULTS_DIR="$(dirname $1/prune)" |
| 189 |
else |
| 190 |
echo ${__GS_USER_DEFAULTS_DIR} |
| 191 |
fi |
| 192 |
} |
| 193 |
|
| 194 |
# Print the "suffix" of the user_defaults_dir, or simply |
| 195 |
# e.g ~/GNUstep/Defaults => GNUstep/Defaults |
| 196 |
egnustep_user_defaults_dir_suffix() { |
| 197 |
echo ${!__GS_USER_DEFAULTS_DIR_SUFFIX} |
| 198 |
} |
| 199 |
|
| 160 |
# Make utilizing GNUstep Makefiles |
200 |
# Make utilizing GNUstep Makefiles |
| 161 |
egnustep_make() { |
201 |
egnustep_make() { |
| 162 |
if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then |
202 |
if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then |
