Lines 50-55
Link Here
|
50 |
unset GNUSTEP_LOCAL_ROOT |
50 |
unset GNUSTEP_LOCAL_ROOT |
51 |
unset GNUSTEP_NETWORK_ROOT |
51 |
unset GNUSTEP_NETWORK_ROOT |
52 |
unset GNUSTEP_USER_ROOT |
52 |
unset GNUSTEP_USER_ROOT |
|
|
53 |
unset GNUSTEP_USER_DIR |
54 |
unset GNUSTEP_USER_DEFAULTS_DIR |
53 |
. /etc/conf.d/gnustep.env |
55 |
. /etc/conf.d/gnustep.env |
54 |
if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then |
56 |
if [ -z "${GNUSTEP_SYSTEM_ROOT}" ] || [ "/" != "${GNUSTEP_SYSTEM_ROOT:0:1}" ]; then |
55 |
eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env" |
57 |
eerror "GNUSTEP_SYSTEM_ROOT is missing or misconfigured in /etc/conf.d/gnustep.env" |
Lines 81-92
Link Here
|
81 |
elif [ -z "${GNUSTEP_USER_ROOT}" ]; then |
83 |
elif [ -z "${GNUSTEP_USER_ROOT}" ]; then |
82 |
GNUSTEP_USER_ROOT='~/GNUstep' |
84 |
GNUSTEP_USER_ROOT='~/GNUstep' |
83 |
fi |
85 |
fi |
|
|
86 |
if [ "${GNUSTEP_USER_DIR}" ] && [ '~' != "${GNUSTEP_USER_DIR:0:1}" ]; then |
87 |
eerror "GNUSTEP_USER_DIR is misconfigured in /etc/conf.d/gnustep.env" |
88 |
eerror "GNUSTEP_USER_DIR=${GNUSTEP_USER_DIR}" |
89 |
die "USE flag misconfiguration -- please correct" |
90 |
elif [ -z "${GNUSTEP_USER_DIR}" ]; then |
91 |
GNUSTEP_USER_DIR='~/GNUstep' |
92 |
fi |
93 |
if [ "${GNUSTEP_USER_DEFAULTS_DIR}" ] && [ '~' != "${GNUSTEP_USER_DEFAULTS_DIR:0:1}" ]; then |
94 |
eerror "GNUSTEP_USER_DEFAULTS_DIR is misconfigured in /etc/conf.d/gnustep.env" |
95 |
eerror "GNUSTEP_USER_DEFAULTS_DIR=${GNUSTEP_USER_DEFAULTS_DIR}" |
96 |
die "USE flag misconfiguration -- please correct" |
97 |
elif [ -z "${GNUSTEP_USER_DEFAULTS_DIR}" ]; then |
98 |
GNUSTEP_USER_DEFAULTS_DIR='~/GNUstep/Defaults' |
99 |
fi |
84 |
|
100 |
|
85 |
egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})" |
101 |
egnustep_prefix "$(dirname ${GNUSTEP_SYSTEM_ROOT})" |
86 |
egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}" |
102 |
egnustep_system_root "${GNUSTEP_SYSTEM_ROOT}" |
87 |
egnustep_local_root "${GNUSTEP_LOCAL_ROOT}" |
103 |
egnustep_local_root "${GNUSTEP_LOCAL_ROOT}" |
88 |
egnustep_network_root "${GNUSTEP_NETWORK_ROOT}" |
104 |
egnustep_network_root "${GNUSTEP_NETWORK_ROOT}" |
89 |
egnustep_user_root "${GNUSTEP_USER_ROOT}" |
105 |
egnustep_user_root "${GNUSTEP_USER_ROOT}" |
|
|
106 |
egnustep_user_dir "${GNUSTEP_USER_DIR}" |
107 |
egnustep_user_defaults_dir "${GNUSTEP_USER_DEFAULTS_DIR}" |
90 |
fi |
108 |
fi |
91 |
elif use layout-osx-like; then |
109 |
elif use layout-osx-like; then |
92 |
egnustep_prefix "/" |
110 |
egnustep_prefix "/" |
Lines 94-99
Link Here
|
94 |
egnustep_local_root "/" |
112 |
egnustep_local_root "/" |
95 |
egnustep_network_root "/Network" |
113 |
egnustep_network_root "/Network" |
96 |
egnustep_user_root '~' |
114 |
egnustep_user_root '~' |
|
|
115 |
egnustep_user_dir '~' |
116 |
egnustep_user_defaults_dir '~/Library/Preferences' |
97 |
else |
117 |
else |
98 |
# setup defaults here |
118 |
# setup defaults here |
99 |
egnustep_prefix "/usr/GNUstep" |
119 |
egnustep_prefix "/usr/GNUstep" |
Lines 101-106
Link Here
|
101 |
egnustep_local_root "/usr/GNUstep/Local" |
121 |
egnustep_local_root "/usr/GNUstep/Local" |
102 |
egnustep_network_root "/usr/GNUstep/Network" |
122 |
egnustep_network_root "/usr/GNUstep/Network" |
103 |
egnustep_user_root '~/GNUstep' |
123 |
egnustep_user_root '~/GNUstep' |
|
|
124 |
egnustep_user_dir '~/GNUstep' |
125 |
egnustep_user_defaults_dir '~/GNUstep/Defaults' |
104 |
fi |
126 |
fi |
105 |
|
127 |
|
106 |
einfo "GNUstep installation will be laid out as follows:" |
128 |
einfo "GNUstep installation will be laid out as follows:" |
Lines 108-113
Link Here
|
108 |
einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`" |
130 |
einfo "\tGNUSTEP_LOCAL_ROOT=`egnustep_local_root`" |
109 |
einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`" |
131 |
einfo "\tGNUSTEP_NETWORK_ROOT=`egnustep_network_root`" |
110 |
einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`" |
132 |
einfo "\tGNUSTEP_USER_ROOT=`egnustep_user_root`" |
|
|
133 |
einfo "\tGNUSTEP_USER_DIR=`egnustep_user_dir`" |
134 |
einfo "\tGNUSTEP_USER_DEFAULTS_DIR=`egnustep_user_defaults_dir`" |
111 |
} |
135 |
} |
112 |
|
136 |
|
113 |
src_compile() { |
137 |
src_compile() { |
Lines 123-128
Link Here
|
123 |
myconf="$myconf --with-local-root=`egnustep_local_root`" |
147 |
myconf="$myconf --with-local-root=`egnustep_local_root`" |
124 |
myconf="$myconf --with-network-root=`egnustep_network_root`" |
148 |
myconf="$myconf --with-network-root=`egnustep_network_root`" |
125 |
myconf="$myconf --with-user-root=`egnustep_user_root`" |
149 |
myconf="$myconf --with-user-root=`egnustep_user_root`" |
|
|
150 |
myconf="$myconf --with-user-dir=`egnustep_user_dir`" |
151 |
myconf="$myconf --with-user-defaults-dir=`egnustep_user_defaults_dir`" |
126 |
econf $myconf || die "configure failed" |
152 |
econf $myconf || die "configure failed" |
127 |
|
153 |
|
128 |
egnustep_make |
154 |
egnustep_make |
Lines 164-169
Link Here
|
164 |
echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env |
190 |
echo "GNUSTEP_LOCAL_ROOT=$(egnustep_local_root)" >> ${D}/etc/conf.d/gnustep.env |
165 |
echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env |
191 |
echo "GNUSTEP_NETWORK_ROOT=$(egnustep_network_root)" >> ${D}/etc/conf.d/gnustep.env |
166 |
echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env |
192 |
echo "GNUSTEP_USER_ROOT='$(egnustep_user_root)'" >> ${D}/etc/conf.d/gnustep.env |
|
|
193 |
echo "GNUSTEP_USER_DIR='$(egnustep_user_dir)'" >> ${D}/etc/conf.d/gnustep.env |
194 |
echo "GNUSTEP_USER_DEFAULTS_DIR='$(egnustep_user_defaults_dir)'" >> ${D}/etc/conf.d/gnustep.env |
167 |
|
195 |
|
168 |
insinto /etc/GNUstep |
196 |
insinto /etc/GNUstep |
169 |
doins ${S}/GNUstep.conf |
197 |
doins ${S}/GNUstep.conf |