diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-10 00:47:32 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-10 00:47:32 +0100 |
| commit | 0a7df07702c6f56b708a22c666077a3b90c7542c (patch) | |
| tree | 760707ab65b4e2ab39ac744d740af03f854dd9b0 /bin | |
| parent | 0a314adfa63669155299c77e479ed68c349643bd (diff) | |
| parent | 99c130f153b88fb9c779b0fd1f91d78cc4e75d01 (diff) | |
| download | nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.tar.gz nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.tar.bz2 nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.zip | |
Merge branch 'sunweaver-pr/use-rpath-for-nxagent' into 3.6.x
Attributes GH PR #313: https://github.com/ArcticaProject/nx-libs/pull/313
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/nxagent.in | 5 | ||||
| -rw-r--r-- | bin/nxproxy.in | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bin/nxagent.in b/bin/nxagent.in index 86603d549..3a9dfc649 100644 --- a/bin/nxagent.in +++ b/bin/nxagent.in @@ -15,11 +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/. -NX_LIBS=@@NXLIBDIR@@ +NX_LIBDIR=@@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/ -exec $NX_LIBS/bin/${NXAPP:-"nxagent"} "$@" +exec $NX_LIBDIR/bin/${NXAPP:-"nxagent"} "$@" diff --git a/bin/nxproxy.in b/bin/nxproxy.in index d21388d18..0866d25ac 100644 --- a/bin/nxproxy.in +++ b/bin/nxproxy.in @@ -15,10 +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/. -NX_LIBS=@@NXLIBDIR@@ +NX_LIBDIR=@@NXLIBDIR@@ # make sure nxagent starts properly with pam_tmpdir.so being in use NX_TEMP=${NX_TEMP:-/tmp} export NX_TEMP -exec $NX_LIBS/bin/${NXAPP:="nxproxy"} "$@" +exec $NX_LIBDIR/bin/${NXAPP:="nxproxy"} "$@" |