Makefile.in: use man pages generated by command_util.sh for tarball

diff --git a/Makefile.in b/Makefile.in
index 4091600fc0bbaae33d6453cd4ecdec26ac41fe5a..0952caeaf61e3d6f80da24bf827eb72578a166fc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,7 +51,6 @@ man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
 FONTS := $(wildcard fonts/*.png)
 PICS := $(wildcard pics/paraslash/*.jpg)
-MANS := $(wildcard doc/man/man1/*.1)
 gengetopts := $(wildcard *.ggo)
 gengetopts_c := $(gengetopts:.ggo=.cmdline.c)
 gengetopts_h := $(gengetopts:.ggo=.cmdline.h)
@@ -72,7 +71,7 @@ shots := gui-2005-11-12.png para_audiod-startup.txt para_krell-2005-02.png \
 shots := $(patsubst %,web/sync/%,$(shots))
 web_pics := web/sync/paraslash.png web/sync/paraslash.ico
 web_misc := overview.pdf versions/paraslash-git.tar.bz2 PUBLIC_KEY \
-       key.anonymous para.css doc
+       key.anonymous para.css
 web_misc := $(patsubst %,web/sync/%,$(web_misc))
 autocrap := config.h.in configure
 tarball_pfx := @PACKAGE_TARNAME@-@PACKAGE_VERSION@
@@ -81,11 +80,13 @@ tarball_delete = web versions pics/screenshots pics/web .changelog_before_cvs \
 tarball_delete := $(patsubst %,$(tarball_pfx)/%,$(tarball_delete))
 tarball_add := $(gengetopts_c) $(gengetopts_h) $(autocrap)
 
-.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta man
+.PHONY: clean distclean maintainer-clean install html www tags doxygen gruta \
+       man html_man
 all: $(BINARIES)
-www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen doc
+www: $(gen_html) $(gruta_html) $(web_pics) $(web_misc) $(shots) tags doxygen
 gruta: $(gen_html) $(gruta_html)
-man: $(man_pages) $(man_pages_html)
+man: $(man_pages)
+html_man: $(man_pages_html)
 
 sdl_gui_objs = sdl_gui.cmdline.o SFont.o sdl_gui.o gui_common.o exec.o \
        close_on_fork.o string.o stat.o fd.o
@@ -255,28 +256,24 @@ maintainer-clean: distclean
        rm -f $(gengetopts_c) $(gengetopts_h) *.tar.bz2 \
                $(grutatxt_html) config.h configure \
                config.h.in skencil/*.pdf skencil/*.ps
-       rm -rf doc
        rm -f *_command_list.* *.man man/man1/* man/html/*
 
 
 install: all
-       umask 022 && \
-       mkdir -p $(BINDIR) && \
-       $(install_sh) -s -m 755 $(BINARIES) $(BINDIR) && \
-       mkdir -p $(FONTDIR) && \
-       $(install_sh) -m 644 $(FONTS) $(FONTDIR) && \
-       mkdir -p $(PICDIR) && \
-       $(install_sh) -m 644 $(PICS) $(PICDIR) && \
-       mkdir -p $(MANDIR) && \
-       $(install_sh) -m 644 $(MANS) $(MANDIR) \
-       mkdir -p $(VARDIR) > /dev/null 2>&1 || exit 0
-
-@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) doc
-       rm -f $(tarball_pfx).tar.bz2
-       git-archive --format=tar --prefix=$(tarball_pfx)/ HEAD | tar --delete $(tarball_delete) > $(tarball_pfx).tar
+       mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR) $(VARDIR)
+       $(install_sh) -s -m 755 $(BINARIES) $(BINDIR)
+       $(install_sh) -m 644 $(FONTS) $(FONTDIR)
+       $(install_sh) -m 644 $(PICS) $(PICDIR)
+       $(install_sh) -m 644 $(man_pages) $(MANDIR)
+
+@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages)
+       rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
+       git-archive --format=tar --prefix=$(tarball_pfx)/ HEAD \
+               | tar --delete $(tarball_delete) > $(tarball_pfx).tar
        mkdir $(tarball_pfx)
        cp -r $(tarball_add) $(tarball_pfx)
-       tar c doc/man | (cd $(tarball_pfx); tar x)
+       mkdir -p $(tarball_pfx)/man/man1
+       cp -r $(man_pages) $(tarball_pfx)/man/man1
        tar rf $(tarball_pfx).tar $(tarball_pfx)/*
        rm -rf $(tarball_pfx)
        bzip2 -9 $(tarball_pfx).tar
@@ -287,16 +284,15 @@ web/%.in.html: %
        grutatxt -nb  < $< > $@
 tags:
        rm -rf web/sync/HTML && gtags && htags -nF && mv HTML web/sync
-doc:
-       para_util doc
 web/header2.html: web/header.html
        sed -e 's|href="|href="\.\.\/\.\./|g' \
                -e 's|SRC="|SRC="\.\.\/\.\./|g' $< > $@
 doxygen: web/header2.html
        mkdir -p web/sync/doxygen
        doxygen
-web/sync/doc: doc
-       cp -a $< $@
+web/sync/man: html_man
+       mkdir -p $@
+       cp -a $(man_pages_html) $@
 web/sync/doxygen:
        mkdir -p $@
 web/sync/%.html: web/%.in.html web/header.html web/footer.html web/sync