Bugfix: Fix assignment of clients to other workspaces (Thanks badboy)

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index 93377aa51db8c0b2228631b8105520fdd439b644..a42099d47eb01a02f3ee7a250045696789488c55 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 UNAME=$(shell uname)
 DEBUG=1
 INSTALL=install
-MAKE=make
 GIT_VERSION=$(shell git describe --tags --always)
 VERSION=$(shell git describe --tags --abbrev=0)
 
@@ -38,6 +37,7 @@ LDFLAGS += -lxcb-aux
 LDFLAGS += -lxcb-icccm
 LDFLAGS += -lxcb-xinerama
 LDFLAGS += -lX11
+LDFLAGS += -lev
 LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
 
 ifeq ($(UNAME),NetBSD)
@@ -91,11 +91,14 @@ install: all
        $(INSTALL) -m 0644 i3.desktop $(DESTDIR)/usr/share/xsessions/
 
 dist: clean
-       [ ! -f i3-${VERSION} ] || rm -rf i3-${VERSION}
+       [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
        [ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
        mkdir i3-${VERSION}
-       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO i3.config i3.desktop pseudo-doc.doxygen i3-${VERSION}
-       cp -r src include docs man i3-${VERSION}
+       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-* i3.config i3.desktop pseudo-doc.doxygen i3-${VERSION}
+       cp -r src include man i3-${VERSION}
+       # Only copy toplevel documentation (important stuff)
+       mkdir i3-${VERSION}/docs
+       find docs -maxdepth 1 -type f ! -name "*.xcf" -exec cp '{}' i3-${VERSION}/docs \;
        sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' Makefile > i3-${VERSION}/Makefile
        tar cf i3-${VERSION}.tar i3-${VERSION}
        bzip2 -9 i3-${VERSION}.tar