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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 9 insertions, 8 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 \ |