diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:08:55 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:08:55 +0200 |
| commit | dd5f5b56b48127641ca2bf70a272f60872f2568b (patch) | |
| tree | e1b687d9c6a658c81801c8fc9dba9a063f22b3da /bin | |
| parent | da7261cfe0244fcf329e0597f9d122293fd4f9eb (diff) | |
| parent | 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c (diff) | |
| download | nx-libs-dd5f5b56b48127641ca2bf70a272f60872f2568b.tar.gz nx-libs-dd5f5b56b48127641ca2bf70a272f60872f2568b.tar.bz2 nx-libs-dd5f5b56b48127641ca2bf70a272f60872f2568b.zip | |
Merge branch 'sunweaver-pr/ld-loading-libX11-hack' into 3.6.x
Attributes GH PR #172: https://github.com/ArcticaProject/nx-libs/pull/172
Reviewed by: Mihai Moldovan <ionic@ionic.de> -- Fri Jul 1 00:38:00 CEST 2016
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Fri Jul 1 00:38:00 CEST 2016
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/nxagent.in (renamed from bin/nxproxy) | 10 | ||||
| -rw-r--r-- | bin/nxproxy.in (renamed from bin/nxagent) | 9 |
2 files changed, 5 insertions, 14 deletions
diff --git a/bin/nxproxy b/bin/nxagent.in index 23e7109e3..86603d549 100644 --- a/bin/nxproxy +++ b/bin/nxagent.in @@ -15,15 +15,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/. -NXAPP=nxproxy -NX_LIBS=/usr/lib/nx -NX_LOCAL_LIBS=/usr/local/lib/nx +NX_LIBS=@@NXLIBDIR@@ # make sure nxagent starts properly with pam_tmpdir.so being in use NX_TEMP=${NX_TEMP:-/tmp} export NX_TEMP +export LD_LIBRARY_PATH=@@NXLIBDIR@@-X11/ -test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS - -exec $NX_LIBS/bin/$NXAPP "$@"
\ No newline at end of file +exec $NX_LIBS/bin/${NXAPP:-"nxagent"} "$@" diff --git a/bin/nxagent b/bin/nxproxy.in index 6306ed069..d21388d18 100644 --- a/bin/nxagent +++ b/bin/nxproxy.in @@ -15,15 +15,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/. -NXAPP=nxagent -NX_LIBS=/usr/lib/nx -NX_LOCAL_LIBS=/usr/local/lib/nx +NX_LIBS=@@NXLIBDIR@@ # make sure nxagent starts properly with pam_tmpdir.so being in use NX_TEMP=${NX_TEMP:-/tmp} export NX_TEMP -test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS -test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS - -exec $NX_LIBS/bin/$NXAPP "$@" +exec $NX_LIBS/bin/${NXAPP:="nxproxy"} "$@" |