diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-04 18:52:04 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:15 +0100 |
| commit | 1e1f1246bb8edc343320f91b8f5edd024bf801b6 (patch) | |
| tree | 3f38f28fb9c4c12b53e01c7bffe5f1a4c07baa58 /bin | |
| parent | af11c31233290984fa2eaf085d0d709b04879a68 (diff) | |
| download | nx-libs-1e1f1246bb8edc343320f91b8f5edd024bf801b6.tar.gz nx-libs-1e1f1246bb8edc343320f91b8f5edd024bf801b6.tar.bz2 nx-libs-1e1f1246bb8edc343320f91b8f5edd024bf801b6.zip | |
Makefile: Align variable names USRLIBDIR, SHLIBDIR (and NX_DIR) with nx-X11 internal naming schemes (and use /usr/<lib>/nx/X11 rather than /usr/<lib>/nx-X11).
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/nxagent.in | 6 | ||||
| -rw-r--r-- | bin/nxproxy.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/nxagent.in b/bin/nxagent.in index 86603d549..b3e87aab1 100644 --- a/bin/nxagent.in +++ b/bin/nxagent.in @@ -15,11 +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/. -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/ +export LD_LIBRARY_PATH=@@NX_LIBDIR@@/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"} "$@" |