diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 15:48:55 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 15:48:55 +0200 |
commit | 2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1 (patch) | |
tree | ba1bf29ee69e8ae391b0773161ff3baf58707761 /Makefile | |
parent | a3a295288189d1312f5abef0e7b4cc57b948e7d3 (diff) | |
parent | 20454528656dbe98a538de7c67ce89e50841bd5f (diff) | |
download | nx-libs-2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1.tar.gz nx-libs-2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1.tar.bz2 nx-libs-2f19f2f66d7cc3d844e8f1eb58d65c4fa6b867d1.zip |
Merge branch 'sunweaver-pr/libXau-cleanup' into 3.6.x
Attributes GH PR #152: https://github.com/ArcticaProject/nx-libs/pull/152
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 14:55:00 +0200
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -103,7 +103,7 @@ install-lite: gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1 install-full: - for f in nxagent nxauth; do \ + for f in nxagent; do \ $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done for d in nxcompext nxcompshad; do \ $(MAKE) -C $$d install; done @@ -115,13 +115,10 @@ install-full: $(INSTALL_FILE) nx-X11/programs/Xserver/Xext/SecurityPolicy $(DESTDIR)$(PREFIX)/share/nx $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin - $(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin $(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/ $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/ - $(INSTALL_FILE) nx-X11/programs/nxauth/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/ - mv -f $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.1 gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1 # create a clean nx-X11/.build-exports space @@ -180,7 +177,7 @@ uninstall-lite: $(RM_DIR) $(DESTDIR)$(NXLIBDIR)/share/nx/ uninstall-full: - for f in nxagent nxauth; do \ + for f in nxagent; do \ $(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done $(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxagent |