Merge branch 'master' into manpage

diff --cc Makefile
index 989c250fb9860427b2e34c7601a08d4086250b0d,cfac2e696072a4a2b87345f146653b3d97bb4fd4..a36d2e0311855c5fd0effbfac0195c31fc79096f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -121,19 -126,13 +126,27 @@@ uninstall_udev
        $(if $(UDEV_RULES_DIR),,$(error UDEV_RULES_DIR is not defined))
        rm -f ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules
  
 +# Rules for manpage
 +MANDIR:=${PREFIX}/share/man/man1
 +DEFAULT_TARGETS+=manpage
 +
 +install_manpage:
 +      mkdir -p ${DESTDIR}/${MANDIR}
 +      cp autorandr.1 ${DESTDIR}/${MANDIR}
 +      mandb -qp
 +
 +uninstall_manpage:
 +      rm -f ${DESTDIR}/${MANDIR}/autorandr.1
 +      mandb -q
 +
++# Rules for launcher
+ install_launcher:
+       gcc -Wall contrib/autorandr_launcher/autorandr_launcher.c -o contrib/autorandr_launcher/autorandr_launcher -lxcb -lxcb-randr
+       install -D -m 755 contrib/autorandr_launcher/autorandr_launcher ${DESTDIR}${PREFIX}/bin/autorandr_launcher
+ 
+ uninstall_launcher:
+       rm -f ${DESTDIR}${PREFIX}/bin/autorandr_launcher
+ 
  TARGETS=$(DEFAULT_TARGETS)
  install: $(patsubst %,install_%,$(TARGETS))
  uninstall: $(patsubst %,uninstall_%,$(TARGETS))