]> git.lizzy.rs Git - bspwm.git/commitdiff
Merge remote-tracking branch 'svenstaro/rename-install-freedesktop-stuff'
authorBastien Dejean <nihilhill@gmail.com>
Sat, 31 Jan 2015 09:41:12 +0000 (10:41 +0100)
committerBastien Dejean <nihilhill@gmail.com>
Sat, 31 Jan 2015 09:41:12 +0000 (10:41 +0100)
1  2 
Makefile

diff --cc Makefile
index e9f405110a9fd867f3b68ec4c1741a4870233ec4,7cd420a38dedb3f9aa6a20f40b2321cc2729fa4a..0e4546c0266b25ae842ede16734f5078e6c8225d
+++ b/Makefile
@@@ -11,9 -11,7 +11,10 @@@ BINPREFIX = $(PREFIX)/bi
  MANPREFIX = $(PREFIX)/share/man
  BASHCPL = $(PREFIX)/share/bash-completion/completions
  ZSHCPL = $(PREFIX)/share/zsh/site-functions
 +DOCPREFIX = $(PREFIX)/share/doc/bspwm
 +
 +MD_DOCS = doc/CONTRIBUTING.md doc/INSTALL.md doc/MISC.md doc/TODO.md
+ XSESSIONS = $(PREFIX)/share/xsessions
  
  WM_SRC = bspwm.c helpers.c settings.c monitor.c desktop.c tree.c stack.c history.c \
         events.c pointer.c window.c messages.c query.c restore.c rule.c ewmh.c subscribe.c
@@@ -52,9 -51,8 +54,11 @@@ install
        cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
        mkdir -p "$(DESTDIR)$(ZSHCPL)"
        cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
 +      mkdir -p "$(DESTDIR)$(DOCPREFIX)"
 +      cp -p $(MD_DOCS) "$(DESTDIR)$(DOCPREFIX)"
 +      cp -pr examples "$(DESTDIR)$(DOCPREFIX)"/examples
+       mkdir -p "$(DESTDIR)$(XSESSIONS)"
+       cp -p contrib/freedesktop/bspwm.desktop "$(DESTDIR)$(XSESSIONS)"
  
  uninstall:
        rm -f "$(DESTDIR)$(BINPREFIX)"/bspwm
@@@ -63,7 -62,7 +68,8 @@@
        rm -f "$(DESTDIR)$(MANPREFIX)"/man1/bspc.1
        rm -f "$(DESTDIR)$(BASHCPL)"/bspc
        rm -f "$(DESTDIR)$(ZSHCPL)"/_bspc
 +      rm -rf "$(DESTDIR)$(DOCPREFIX)"
+       rm -f "$(DESTDIR)$(XSESSIONS)"/bspwm.desktop
  
  doc:
        a2x -v -d manpage -f manpage -a revnumber=$(VERSION) doc/bspwm.1.txt