Jeff Teunissen wrote:
>
> Couple patches for the Makefiles: $GNUSTEP_NETWORK_ROOT should be part of
> the GNUSTEP_PATHPREFIX_LIST, shouldn't it?
>
> Also, a patch for openapp. Since GNUstep app wrappers have their own logic
> for determining which executable to run and which library combination to
> use, openapp could be massively simplified (and also made compatible with
> non-GNUstep .app wrappers) by not duplicating the logic in openapp. Or am
> I wrong?
>
> In any case, the openapp patch makes non-GNUstep apps like Window Maker's
> WPrefs work with openapp, without breaking GNUstep apps that I've
> discovered.
Whoops, I screwed up the GNUstep.(csh|sh).in patches. Here are the right
ones.
--
| Jeff Teunissen - Pres., Dusk To Dawn Computing - deek at dusknet.dhs.org
| Disclaimer: I am my employer, so anything I say goes for me too. :)
| Core developer, The QuakeForge Project http://www.quakeforge.net/
| Specializing in Debian GNU/Linux http://dusknet.dhs.org/~deek/
--- make/GNUstep.csh.in.orig Sun Jul 30 06:43:45 2000
+++ make/GNUstep.csh.in Sun Jul 30 06:45:36 2000
@@ -31,7 +31,7 @@
endif
setenv GNUSTEP_LOCAL_ROOT "${GNUSTEP_ROOT}/Local"
-setenv GNUSTEP_NETWORK_ROOT
+setenv GNUSTEP_NETWORK_ROOT "${GNUSTEP_ROOT}/Network"
setenv GNUSTEP_USER_ROOT ~/GNUstep
if ( ! ${?GNUSTEP_BUILD_ROOT} ) then
@@ -69,7 +69,7 @@
#
if ( ! ${?GNUSTEP_PATHPREFIX} ) then
setenv GNUSTEP_PATHPREFIX \
- ${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_SYSTEM_ROOT}
+
+${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_NETWORK_ROOT}:${GNUSTEP_SYSTEM_ROOT}
endif
set tp = ""
@@ -102,7 +102,7 @@
#
#
#
-set
gnustep_class_path="${GNUSTEP_USER_ROOT}/Libraries/Java:${GNUSTEP_LOCAL_ROOT}/Libraries/Java:${GNUSTEP_SYSTEM_ROOT}/Libraries/Java"
+set
+gnustep_class_path="${GNUSTEP_USER_ROOT}/Libraries/Java:${GNUSTEP_LOCAL_ROOT}/Libraries/Java:${GNUSTEP_NETWORK_ROOT}/Libraries/Java:${GNUSTEP_SYSTEM_ROOT}/Libraries/Java"
if ( ! ${?CLASSPATH} ) then
setenv CLASSPATH "${gnustep_class_path}"
--- make/GNUstep.sh.in.orig Sun Jul 30 06:43:51 2000
+++ make/GNUstep.sh.in Sun Jul 30 06:47:00 2000
@@ -73,7 +73,7 @@
# Add the GNUstep tools directories to the path
#
if [ -z "$GNUSTEP_PATHPREFIX_LIST" ]; then
- GNUSTEP_PATHPREFIX_LIST=$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_SYSTEM_ROOT
+
+GNUSTEP_PATHPREFIX_LIST=$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_NETWORK_ROOT:$GNUSTEP_SYSTEM_ROOT
export GNUSTEP_PATHPREFIX_LIST
fi
tmp_IFS="$IFS"
@@ -115,7 +115,7 @@
fi # [ -z "$GNUSTEP_BUILD_ROOT" ]
-gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
+gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_NETWORK_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
if [ -z "$CLASSPATH" ]; then
CLASSPATH="$gnustep_class_path"
