aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-21 10:42:47 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-04-23 06:34:13 +0200
commite69b7d1ecf9672effd4715a4bc8d5bd729b5bd37 (patch)
tree5060eb62bb9394e8d9dad3965df43644d161b2d7 /Makefile
parent825af1835c81070931d078b153e2d49df4a6bc69 (diff)
downloadnx-libs-e69b7d1ecf9672effd4715a4bc8d5bd729b5bd37.tar.gz
nx-libs-e69b7d1ecf9672effd4715a4bc8d5bd729b5bd37.tar.bz2
nx-libs-e69b7d1ecf9672effd4715a4bc8d5bd729b5bd37.zip
xbitmaps cleanup: The <X11/bitmaps/*> headers are not required at build time for NX.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6400f21dd..9f6442181 100644
--- a/Makefile
+++ b/Makefile
@@ -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)/