doc: fix makefiles

diff --git a/doc/Makefile b/doc/Makefile
index 4a2fc92d8dd1b08dc4e019340e5ec019d6c7e614..3230a149d46e2e9c05a08a781751634e1bcc842d 100644 (file)
--- 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 3911cc9cf748d960fd794fb90049fe2f291dfbe7..e191ec00b13d2aa84d0834a3b2e93e816516b2d5 100644 (file)
--- 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:
+