From 760c5c07c63798e0e065020456e7514c8dd8b72d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 12 Jan 2012 13:00:23 +0100 Subject: 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. --- debian/patches/022_add-nxproxy-wrapper.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'debian/patches/022_add-nxproxy-wrapper.patch') diff --git a/debian/patches/022_add-nxproxy-wrapper.patch b/debian/patches/022_add-nxproxy-wrapper.patch index cedfde399..53b0c2959 100644 --- a/debian/patches/022_add-nxproxy-wrapper.patch +++ b/debian/patches/022_add-nxproxy-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/nxproxy "$@" ++exec $NX_LIBS/nxproxy "$@" -- cgit v1.2.3