diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-23 13:29:10 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-23 13:29:10 +0200 |
| commit | 2b159e18dda7475db1867d3981ad0905f7531dbe (patch) | |
| tree | 5060eb62bb9394e8d9dad3965df43644d161b2d7 /Makefile | |
| parent | 825af1835c81070931d078b153e2d49df4a6bc69 (diff) | |
| parent | e69b7d1ecf9672effd4715a4bc8d5bd729b5bd37 (diff) | |
| download | nx-libs-2b159e18dda7475db1867d3981ad0905f7531dbe.tar.gz nx-libs-2b159e18dda7475db1867d3981ad0905f7531dbe.tar.bz2 nx-libs-2b159e18dda7475db1867d3981ad0905f7531dbe.zip | |
Merge branch 'sunweaver-pr/xbitmaps-cleanup' into arctica-3.6.x
Attributes GH PR #16: https://github.com/ArcticaProject/nx-libs/pull/16
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -147,7 +147,7 @@ install-full: $(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR) $(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(USRLIBDIR)/ - . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \ + . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | \ while read dirname; do \ $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(INCLUDEDIR)/nx")"; \ $(INSTALL_FILE) $${dirname}/*.h \ @@ -161,10 +161,6 @@ install-full: $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama $(INSTALL_SYMLINK) $(USRLIBDIR)/libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps - $(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \ - $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps/ - $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_NX) $(INSTALL_DIR) $(DESTDIR)/$(ETCDIR_X2GO) $(INSTALL_FILE) etc/keystrokes.cfg $(DESTDIR)/$(ETCDIR_NX)/ |