Cleanup config memory

[wmpus] / makefile

diff --git a/makefile b/makefile
index 20162c4c2328511596b3f3ab363aab412ed07b26..a00980e7d19e792fd2d7f0079b358ea354f85322 100644 (file)
--- a/makefile
+++ b/makefile
@@ -3,21 +3,27 @@
 
 -include config.mk
 
-VERSION   ?= 0.1-p0
+VERSION   ?= 0.1-rc1
 WM        ?= wmii
 SYS       ?= x11
 CFLAGS    ?= -g -Wall
 PREFIX    ?= /usr/local
 MANPREFIX ?= ${PREFIX}/share/man
 
-ifeq ($(SYS),x11)
+ifeq ($(SYS),xcb)
+GCC       ?= gcc
+PROG      ?= wmpus
+LDFLAGS   += -lxcb -lxcb-keysyms -lxcb-util -lxcb-icccm -lxcb-ewmh -lxcb-xinerama
+endif
+
+ifeq ($(SYS),xlib)
 GCC       ?= gcc
 PROG      ?= wmpus
 LDFLAGS   += -lX11 -lXinerama
 endif
 
 ifeq ($(SYS),win32)
-GCC       ?= i486-mingw32-gcc
+GCC       ?= mingw32-gcc
 PROG      ?= wmpus.exe
 LDFLAGS   += -lgdi32
 endif
@@ -32,8 +38,11 @@ dist:
                README LICENSE config.mk.example makefile *.1 *.c *.h
 
 install: all
+       sed -i 's:/usr.*:$(PREFIX)/bin/wmpus:' wmpus.session
        install -m 755 -D $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
        install -m 644 -D wmpus.1 $(DESTDIR)$(MANPREFIX)/man1/wmpus.1
+       install -m 755 -D wmpus.session $(DESTDIR)/etc/X11/Sessions/wmpus
+       install -m 644 -D wmpus.desktop $(DESTDIR)$(PREFIX)/share/xsessions/wmpus.desktop
 
 uninstall:
        rm -f $(DESTDIR)$(PREFIX)/bin/$(PROG)