Update make dist

diff --git a/Makefile b/Makefile
index 850693e3463dd0f00336038226504337dd303cd3..419dc561ab355215cfe297f486ff4b107af3529a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,16 +28,19 @@ install: all
        $(INSTALL) -m 0644 i3.desktop $(DESTDIR)/usr/share/xsessions/
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
 
-dist: clean
+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-* i3.config i3.desktop pseudo-doc.doxygen i3-${VERSION}
-       cp -r src include man i3-${VERSION}
+       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop 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 \;
-       sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' Makefile > i3-${VERSION}/Makefile
+       sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' common.mk > i3-${VERSION}/common.mk
+       # Pre-generate a manpage to allow distributors to skip this step and save some dependencies
+       make -C man
+       cp man/i3.1 i3-${VERSION}/man/i3.1
        tar cf i3-${VERSION}.tar i3-${VERSION}
        bzip2 -9 i3-${VERSION}.tar
        rm -rf i3-${VERSION}
@@ -50,3 +53,4 @@ clean:
 
 distclean: clean
        rm -f i3
+       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg distclean