diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-04 18:52:04 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-09 23:38:11 +0000 |
| commit | c45cab1ba5a6ffe3832039d89c26a6d11068d417 (patch) | |
| tree | bac78a51147dc201ad7c165cc4caf24e048b1489 | |
| parent | 0a314adfa63669155299c77e479ed68c349643bd (diff) | |
| download | nx-libs-c45cab1ba5a6ffe3832039d89c26a6d11068d417.tar.gz nx-libs-c45cab1ba5a6ffe3832039d89c26a6d11068d417.tar.bz2 nx-libs-c45cab1ba5a6ffe3832039d89c26a6d11068d417.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).
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | bin/nxagent.in | 6 | ||||
| -rw-r--r-- | bin/nxproxy.in | 4 | ||||
| -rw-r--r-- | debian/nxagent.install | 2 | ||||
| -rw-r--r-- | nx-libs.spec | 4 |
5 files changed, 17 insertions, 16 deletions
@@ -13,9 +13,10 @@ ETCDIR_NX ?= /etc/nxagent PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin LIBDIR ?= $(PREFIX)/lib -USRLIBDIR ?= $(LIBDIR) +SHLIBDIR ?= $(LIBDIR) +NXLIBDIR ?= $(SHLIBDIR)/nx +USRLIBDIR ?= $(NXLIBDIR)/X11 INCLUDEDIR ?= $(PREFIX)/include -NXLIBDIR ?= $(LIBDIR)/nx CONFIGURE ?= ./configure NX_VERSION_MAJOR=$(shell ./version.sh 1) @@ -143,13 +144,13 @@ install-full: cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \ done; + $(INSTALL_DIR) $(DESTDIR)$(SHLIBDIR) + $(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so $(DESTDIR)$(SHLIBDIR)/ + $(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so.6 $(DESTDIR)$(SHLIBDIR)/ + $(COPY_DEREFERENCED) nx-X11/.build-exports/lib/libNX_X11.so.6.2 $(DESTDIR)$(SHLIBDIR)/ $(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR) - $(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so $(DESTDIR)$(USRLIBDIR)/ - $(COPY_SYMLINK) nx-X11/.build-exports/lib/libNX_X11.so.6 $(DESTDIR)$(USRLIBDIR)/ - $(COPY_DEREFERENCED) nx-X11/.build-exports/lib/libNX_X11.so.6.2 $(DESTDIR)$(USRLIBDIR)/ - $(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR)/nx-X11 - $(INSTALL_SYMLINK) ../libNX_X11.so.6 $(DESTDIR)$(USRLIBDIR)/nx-X11/libX11.so.6 - $(INSTALL_SYMLINK) ../libNX_X11.so.6.2 $(DESTDIR)$(USRLIBDIR)/nx-X11/libX11.so.6.2 + $(INSTALL_SYMLINK) ../../libNX_X11.so.6 $(DESTDIR)$(USRLIBDIR)/libX11.so.6 + $(INSTALL_SYMLINK) ../../libNX_X11.so.6.2 $(DESTDIR)$(USRLIBDIR)/libX11.so.6.2 . replace.sh; set -x; find nx-X11/.build-exports/include/{nx*,GL} -type d | \ while read dirname; do \ 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"} "$@" diff --git a/debian/nxagent.install b/debian/nxagent.install index 75e72fcde..5f6a9de35 100644 --- a/debian/nxagent.install +++ b/debian/nxagent.install @@ -4,7 +4,7 @@ usr/share/nx/rgb usr/share/nx/VERSION.nxagent usr/share/man/man1/nxagent.1* usr/lib/*/nx/bin/nxagent -usr/lib/*/nx-X11/ +usr/lib/*/nx/X11/ usr/bin/nxagent usr/share/pixmaps/nxagent.xpm etc/nxagent/nxagent.keyboard diff --git a/nx-libs.spec b/nx-libs.spec index 8fb25bf07..0eae1b482 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -515,8 +515,8 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans %{_bindir}/nxagent %dir %{_libdir}/nx/bin %{_libdir}/nx/bin/nxagent -%dir %{_libdir}/nx-X11 -%{_libdir}/nx-X11/libX11.so* +%dir %{_libdir}/nx/X11 +%{_libdir}/nx/X11/libX11.so* %{_datadir}/pixmaps/nxagent.xpm %dir %{_datadir}/nx %{_datadir}/nx/rgb |