Move mans to the new Makefile layout

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index 5374527dc16f86249ab195df6ae55a1ae269ca7c..94c9c63e2bb6e4b1934e40c14acd3bbad51ebecb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ include i3-nagbar/i3-nagbar.mk
 include i3bar/i3bar.mk
 include i3-dump-log/i3-dump-log.mk
 include docs/docs.mk
+include man/man.mk
 
 real-all: $(ALL_TARGETS)
 
@@ -35,7 +36,6 @@ dist: distclean
        mkdir i3-${VERSION}/docs
        # Pre-generate documentation
        $(MAKE) docs
-       $(MAKE) -C i3bar/doc
        # Cleanup τεχ output files
        find docs -regex ".*\.\(aux\|out\|log\|toc\|bm\|dvi\|log\)" -exec rm '{}' \;
        find docs -maxdepth 1 -type f ! \( -name "*.xcf" -or -name "*.svg" \) -exec cp '{}' i3-${VERSION}/docs \;
@@ -44,15 +44,13 @@ dist: distclean
        find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \;
        sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/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
+       $(MAKE) mans
        cp man/*.1 i3-${VERSION}/man/
-       cp i3bar/doc/*.1 i3-${VERSION}/i3bar/doc/
        tar cfj i3-${VERSION}.tar.bz2 i3-${VERSION}
        rm -rf i3-${VERSION}
 
 clean: $(CLEAN_TARGETS)
        (which lcov >/dev/null 2>&1 && lcov -d . --zerocounters) || true
-       $(MAKE) -C man clean
 
 distclean: clean $(DISTCLEAN_TARGETS)