diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 16:42:39 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-15 16:42:39 +0100 |
| commit | 8c5a1b071cef42ced9451856f6cec46c30072f2d (patch) | |
| tree | 6c5d41e3269111b98b1749d55ebaba3beaaab3e9 /Makefile | |
| parent | b1d3f2ca5552528c01eefce7e55c18c36965660d (diff) | |
| parent | 9ad0aae5d04fcea85d7059a4530c63423f09ea09 (diff) | |
| download | nx-libs-8c5a1b071cef42ced9451856f6cec46c30072f2d.tar.gz nx-libs-8c5a1b071cef42ced9451856f6cec46c30072f2d.tar.bz2 nx-libs-8c5a1b071cef42ced9451856f6cec46c30072f2d.zip | |
Merge branch 'sunweaver-pr/move-nxcompext-into-Xserver' into 3.6.x
Attributes GH PR: https://github.com/ArcticaProject/nx-libs/pull/277
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 15 Nov 2016 00:54:44 -0800
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -29,7 +29,6 @@ SHELL:=/bin/bash if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi if test -d nx-X11; then \ - if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \ fi @@ -70,7 +69,6 @@ build-full: # nxcomp{ext,shad}. cd nx-X11/lib && make - cd nxcompext && autoconf && (${CONFIGURE}) && ${MAKE} cd nxcompshad && autoconf && (${CONFIGURE}) && ${MAKE} cd nx-X11 && ${MAKE} World @@ -112,8 +110,7 @@ install-full: sed -e 's|@@NXLIBDIR@@|$(NXLIBDIR)|g' bin/nxagent.in > bin/nxagent $(INSTALL_PROGRAM) bin/nxagent $(DESTDIR)$(BINDIR) - for d in nxcompext nxcompshad; do \ - $(MAKE) -C $$d install; done + $(MAKE) -C nxcompshad install $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps $(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/nxagent.xpm $(DESTDIR)$(PREFIX)/share/pixmaps @@ -198,7 +195,6 @@ uninstall-full: $(RM_DIR) $(DESTDIR)$(NXLIBDIR)/share/nx/ if test -d nx-X11; then \ - if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ if test -f nx-X11/Makefile; then \ if test -d $(NXLIBDIR); then rm -rf $(NXLIBDIR); fi; \ |