diff options
| author |   Eric Hameleers <alien@slackware.com> | 2008-12-31 12:46:36 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2008-12-31 12:46:36 +0000 |
| commit | 2850012e514f7de7a96c89eb900b19f29106c7bc (patch) | |
| tree | 1253966c786def96a6d3ecb9f8bcdaaefe7f5d84 /freenx | |
| parent | 99bfc840b90bb91568dc37e6954236c49c3bdf9f (diff) | |
| download | asb-2850012e514f7de7a96c89eb900b19f29106c7bc.tar.gz asb-2850012e514f7de7a96c89eb900b19f29106c7bc.tar.xz | |
Initial revision
Diffstat (limited to 'freenx')
| -rw-r--r-- | freenx/build/nxpaths.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/freenx/build/nxpaths.diff b/freenx/build/nxpaths.diff new file mode 100644 index 00000000..16f8402e --- /dev/null +++ b/freenx/build/nxpaths.diff @@ -0,0 +1,31 @@ +--- freenx-server-0.7.3/nxloadconfig.orig 2008-12-31 13:15:36.000000000 +0100 ++++ freenx-server-0.7.3/nxloadconfig 2008-12-31 13:44:02.000000000 +0100 +@@ -56,8 +56,8 @@ + NX_LICENSE="OS (GPL, using backend: %BACKEND%)" + + # Where can different nx components be found +-NX_DIR=/usr +-PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys ++NX_DIR=/usr/lib/NX ++PATH_BIN=/usr/bin # if you change that, be sure to also change the public keys + PATH_LIB=$NX_DIR/lib + NX_ETC_DIR=/etc/nxserver + NX_SESS_DIR=/var/lib/nxserver/db +@@ -317,7 +317,7 @@ + [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB + [ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" + +-NX_BACKEND_VERSION=$(strings $PATH_BIN/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') ++NX_BACKEND_VERSION=$(strings $NX_DIR/nxagent 2>/dev/null | egrep 'NXAGENT - Version' | sed 's/.*Version //g') + + [ "$ENABLE_1_5_0_BACKEND" = "1" ] && NX_BACKEND_VERSION="1.5.0" # forced the backend + +@@ -606,7 +606,7 @@ + [ -z $(echo "$ENABLE_ROOTLESS_MODE" | egrep "^[0|1]$") ] && \ + ERROR="yes" && echo "Error: Invalid value \"ENABLE_ROOTLESS_MODE=$ENABLE_ROOTLESS_MODE\"" + +- [ -z "$(strings $PATH_BIN/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ ++ [ -z "$(strings $NX_DIR/nxagent | egrep 'NXAGENT - Version 1.5.0|NXAGENT - Version 2.[01].0|NXAGENT - Version 3.[012].0')" ] && \ + WARNING="yes" && echo "Error: Could not find 1.5.0 or 2.[01].0 or 3.[01].0 version string in nxagent. NX 1.5.0 or 2.[01].0 or 3.[012].0 backend is needed for this version of FreeNX." + + [ -z $(echo "$ENABLE_USESSION" | egrep "^[0|1]$") ] && \ |