diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-12 13:00:23 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-01-12 13:00:23 +0100 |
commit | 760c5c07c63798e0e065020456e7514c8dd8b72d (patch) | |
tree | d23dbbd9eb45acd634fc4f4c7a1b1478629111cb /debian/patches/023_add-x2goagent-wrapper.patch | |
parent | d6fee9a41fa3ba5db01d46963571a5a039ad1786 (diff) | |
download | nx-libs-760c5c07c63798e0e065020456e7514c8dd8b72d.tar.gz nx-libs-760c5c07c63798e0e065020456e7514c8dd8b72d.tar.bz2 nx-libs-760c5c07c63798e0e065020456e7514c8dd8b72d.zip |
Provide patches that are tarball / distro aware. Either NX (redistributed) has been installed to /usr/local/lib/nx via tarball or it has been packagedfor a distribution and is installed to /usr/lib/nx. Other installation paths are currently not supported.
Diffstat (limited to 'debian/patches/023_add-x2goagent-wrapper.patch')
-rw-r--r-- | debian/patches/023_add-x2goagent-wrapper.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/patches/023_add-x2goagent-wrapper.patch b/debian/patches/023_add-x2goagent-wrapper.patch index ca53fdee0..ca7d92e9e 100644 --- a/debian/patches/023_add-x2goagent-wrapper.patch +++ b/debian/patches/023_add-x2goagent-wrapper.patch @@ -19,9 +19,10 @@ +# along with this program. If not, see http://www.gnu.org/licenses/. + +NX_LIBS=/usr/lib/nx -+LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH ++NX_LOCAL_LIBS=/usr/local/lib/nx ++LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH + -+export NX_LIBS ++test -d NX_LIBS && export NX_LIBS || export NX_LIBS=$NX_LOCAL_LIBS +export LD_LIBRARY_PATH + -+exec /usr/lib/nx/x2goagent "$@" ++exec $NX_LIBS/../x2go/x2goagent "$@" |