man-pages: adopt Makefiles to new man-pages

diff --git a/Makefile b/Makefile
index d0f7e8c48e779e7a0e6f5cecb2916edb676e3af0..922dc134da66b8c5771e9a62f72f508c4358332d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -108,12 +108,14 @@ install-local:
        rm -rf $(LOCALBINDIR)
        rm -rf $(LOCALLIBDIR)
        rm -rf $(LOCALMAKDIR)
+       rm -rf $(LOCALDOCDIR)
        @echo removing old plugins...
        rm -rf $(LOCALPLUGINDIR)
        $(MAKE) -C generic install-local
        $(MAKE) -C local install-local
        $(MAKE) -C templates install-local
        $(MAKE) -C extensions install-local
+       $(MAKE) -C doc install-local
 
 doc:
        for s in $(SUBDIRS) ; do \

diff --git a/doc/man/Makefile b/doc/man/Makefile
index cac541661f0df89558d004be90d0545a5aeb223a..3911cc9cf748d960fd794fb90049fe2f291dfbe7 100644 (file)
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -29,8 +29,8 @@ TOPLEVEL = ../..
 
 include $(TOPLEVEL)/make.vars
 
-MANPAGES1    = \
-e2.1 \
+MANPAGES1 = \
+e2factory.1 \
 e2-build.1 \
 e2-cf.1 \
 e2-create-project.1 \
@@ -39,58 +39,48 @@ e2-dsort.1 \
 e2-fetch-project.1 \
 e2-fetch-sources.1 \
 e2-install-e2.1 \
+e2-locate-project-root.1 \
 e2-ls-project.1 \
 e2-new-source.1 \
-e2-playground.1 \
-e2.conf.5
+e2-playground.1 
 
-MANPAGES5 = e2rc.5 e2config.5
-MANPAGES7 = e2global.7 e2intro.7 e2workflow.7
-MANPAGES = $(MANPAGES1) $(MANPAGES5) $(MANPAGES7)
+MANPAGES5 = \
+e2.conf.5 \
+e2chroot.5 \
+e2env.5 \
+e2licence.5 \
+e2project.5 \
+e2rc.5 \
+e2result.5 \
+e2source.5
 
-MANPAGES_HTML = $(MANPAGES:=.html)
+MANPAGES = $(MANPAGES1) $(MANPAGES5)
 
-CLEAN_FILES = *~ man.tar.gz $(MANPAGES_HTML)
+CLEAN_FILES = *~ $(MANPAGES)
 
-.PHONY: html man doc install-doc
+.PHONY: all install install-local uninstall clean
 
 all:
 
-install:
-       mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man7
+install: $(MANPAGES)
+       mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5
        install -m644 $(MANPAGES1) $(DESTDIR)$(MANDIR)/man1
        install -m644 $(MANPAGES5) $(DESTDIR)$(MANDIR)/man5
-       install -m644 $(MANPAGES7) $(DESTDIR)$(MANDIR)/man7
+
+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
-       for x in $(MANPAGES7) ; do rm -f $(DESTDIR)$(MANDIR)/man7/$$x ; done
        rmdir $(DESTDIR)$(MANDIR)/man1 || :
        rmdir $(DESTDIR)$(MANDIR)/man5 || :
-       rmdir $(DESTDIR)$(MANDIR)/man7 || :
-
-doc: man.tar.gz
-       for s in $(SUBDIRS) ; do \
-               $(MAKE) -C $$s $@ ;\
-       done
 
-install-doc: doc
-       for s in $(SUBDIRS) ; do \
-               $(MAKE) -C $$s $@ ;\
-       done
-       tar -C $(DOCDIR) -xzf man.tar.gz
+%: %.in
+       sed s/@VERSION@/$(VERSION)/g $< > $@
 
 clean:
        rm -f $(CLEAN_FILES)
        rm -fr html man
-
-%.html: %
-       man2html -r $< >$@
-
-man.tar.gz: $(MANPAGES_HTML)
-       mkdir -p html man/man1 man/man5 man/man7
-       cp *.1.html man/man1/
-       cp *.5.html man/man5/
-       cp *.7.html man/man7/
-       tar -czf man.tar.gz man

diff --git a/make.vars b/make.vars
index 37512222283eedf9840e5d0de446637fabff96c7..1912aed2d1dcac060682dd304887767ab14322f0 100644 (file)
--- a/make.vars
+++ b/make.vars
@@ -62,7 +62,8 @@ LOCALBINDIR = $(LOCALPREFIX)/bin
 LOCALLIBDIR = $(LOCALPREFIX)/lib/e2
 LOCALMAKDIR = $(LOCALPREFIX)/lib/make
 LOCALPLUGINDIR = $(LOCALPREFIX)/plugins
-export LOCALPREFIX LOCALBINDIR LOCALLIBDIR LOCALMAKDIR LOCALPLUGINDIR
+LOCALDOCDIR = $(LOCALPREFIX)/doc
+export LOCALPREFIX LOCALBINDIR LOCALLIBDIR LOCALMAKDIR LOCALPLUGINDIR LOCALDOCDIR
 
 ARCH             = $(shell uname -m)
 LUA_VERSION       = 5.1.3