Bugfix: Don’t invert directions when resizing floating clients (top/left) (Thanks...

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index 6e07d08054e9a396d8bca841fe13826f06e00d8e..9e615d6d8ed9163d8fcef6f3aa7c7b94fc3c7503 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ loglevels.h:
        done; \
        echo "};") > include/loglevels.h;
 
-src/cfgparse.yy.o: src/cfgparse.l ${HEADERS}
+src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS}
        echo "LEX $<"
        flex -i -o$(@:.o=.c) $<
        $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
@@ -56,13 +56,16 @@ src/cfgparse.y.o: src/cfgparse.y ${HEADERS}
 
 install: all
        echo "INSTALL"
-       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
-       $(INSTALL) -d -m 0755 $(DESTDIR)/etc/i3
-       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/share/xsessions
-       $(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
-       test -e $(DESTDIR)/etc/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
-       $(INSTALL) -m 0644 i3.welcome $(DESTDIR)/etc/i3/welcome
-       $(INSTALL) -m 0644 i3.desktop $(DESTDIR)/usr/share/xsessions/
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions
+       $(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/
+       $(INSTALL) -m 0755 i3-wsbar $(DESTDIR)$(PREFIX)/bin/
+       test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
+       $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome
+       $(INSTALL) -m 0644 i3.desktop $(DESTDIR)$(PREFIX)/share/xsessions/
+       $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-input install
 
@@ -70,11 +73,13 @@ dist: distclean
        [ ! -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 RELEASE-NOTES-${VERSION} i3.config i3.desktop i3.welcome pseudo-doc.doxygen Makefile i3-${VERSION}
+       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop i3.welcome i3-wsbar pseudo-doc.doxygen Makefile i3-${VERSION}
        cp -r src i3-msg 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 \;
+       # Pre-generate documentation
+       make -C docs
+       find docs -maxdepth 1 -type f ! \( -name "*.xcf" -or -name "*.svg" \) -exec cp '{}' i3-${VERSION}/docs \;
        # Only copy source code from i3-input
        mkdir i3-${VERSION}/i3-input
        find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \;
@@ -86,7 +91,7 @@ dist: distclean
        rm -rf i3-${VERSION}
 
 clean:
-       rm -f src/*.o src/cfgparse.tab.{c,h} src/cfgparse.yy.c loglevels.tmp include/loglevels.h
+       rm -f src/*.o src/cfgparse.tab.{c,h} src/cfgparse.{output,dot} src/cfgparse.yy.c loglevels.tmp include/loglevels.h
        $(MAKE) -C docs clean
        $(MAKE) -C man clean
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg clean