From 192eb9f78e816e758e4eed520c18e2fb3f247d77 Mon Sep 17 00:00:00 2001
From: Thomas Brinker <thomas.brinker@emlix.com>
Date: Mon, 14 Jan 2013 15:24:44 +0100
Subject: [PATCH] doc: fix makefiles

---
 doc/Makefile     |  5 ++---
 doc/man/Makefile | 24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 4a2fc92..3230a14 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -25,7 +25,7 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-SUBDIRS    = ldoc developer man manual
+SUBDIRS    = ldoc developer man
 TOPLEVEL   = ..
 
 include $(TOPLEVEL)/make.vars
@@ -67,12 +67,11 @@ doc:
 	$(MAKE) documentation.tar.gz
 
 documentation.tar.gz: developer/e2factory.tar.gz \
-					man/man.tar.gz manual/manual.tar.gz
+					man/man.tar.gz
 	rm -fr documentation
 	mkdir -p documentation/developer
 	tar -C documentation/developer -xzf developer/e2factory.tar.gz
 	tar -C documentation -xzf man/man.tar.gz
-	tar -C documentation -xzf manual/manual.tar.gz
 	cp $(TOPLEVEL)/Changelog documentation
 	tar -czf documentation.tar.gz documentation
 
diff --git a/doc/man/Makefile b/doc/man/Makefile
index 3911cc9..e191ec0 100644
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -56,7 +56,7 @@ e2source.5
 
 MANPAGES = $(MANPAGES1) $(MANPAGES5)
 
-CLEAN_FILES = *~ $(MANPAGES)
+CLEAN_FILES = *~ $(MANPAGES) man.tar.gz
 
 .PHONY: all install install-local uninstall clean
 
@@ -67,20 +67,32 @@ install: $(MANPAGES)
 	install -m644 $(MANPAGES1) $(DESTDIR)$(MANDIR)/man1
 	install -m644 $(MANPAGES5) $(DESTDIR)$(MANDIR)/man5
 
-install-local: $(MANPAGES)
-	mkdir -p $(LOCALDOCDIR)/man/man1 $(LOCALDOCDIR)/man/man5
-	install -m644 $(MANPAGES1) $(LOCALDOCDIR)/man/man1
-	install -m644 $(MANPAGES5) $(LOCALDOCDIR)/man/man5
-
 uninstall:
 	for x in $(MANPAGES1) ; do rm -f $(DESTDIR)$(MANDIR)/man1/$$x ; done
 	for x in $(MANPAGES5) ; do rm -f $(DESTDIR)$(MANDIR)/man5/$$x ; done
 	rmdir $(DESTDIR)$(MANDIR)/man1 || :
 	rmdir $(DESTDIR)$(MANDIR)/man5 || :
 
+local:
+
+install-local: doc
+	mkdir -p $(LOCALDOCDIR)/man/man1 $(LOCALDOCDIR)/man/man5
+	install -m644 $(MANPAGES1) $(LOCALDOCDIR)/man/man1
+	install -m644 $(MANPAGES5) $(LOCALDOCDIR)/man/man5
+
+doc: $(MANPAGES)
+	tar -czf man.tar.gz $(MANPAGES)
+
 %: %.in
 	sed s/@VERSION@/$(VERSION)/g $< > $@
 
+install-doc:
+
 clean:
 	rm -f $(CLEAN_FILES)
 	rm -fr html man
+
+check:
+
+localdist:
+
-- 
2.39.5