Makefile.in: fix target web/misc

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5afade9fcd98759114947ab0f9fbec4e329d2b21..d60ddf9b5dc2d9da1e3e8aca5f2a5e045846d6e4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,8 +43,9 @@ CPPFLAGS += -Wshadow
 
 BINARIES = para_server para_client para_gui para_audioc para_recv \
        para_filter para_write @extra_binaries@
 
 BINARIES = para_server para_client para_gui para_audioc para_recv \
        para_filter para_write @extra_binaries@

-man_binaries := para_server para_client para_gui para_audioc para_recv \
+all_man_binaries := para_server para_client para_gui para_audioc para_recv \

         para_filter para_write  para_fade para_sdl_gui para_audiod
         para_filter para_write  para_fade para_sdl_gui para_audiod

+man_binaries := $(filter-out para_dbadm para_slider para_krell.so, $(BINARIES))

 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
 FONTS := $(wildcard fonts/*.png)
 man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
 man_pages_html := $(patsubst %, man/html/%.html, $(man_binaries))
 FONTS := $(wildcard fonts/*.png)


@@ -68,7 +69,7 @@ shots := gui-2005-11-12.png para_audiod-startup.txt para_krell-2005-02.png \
        para_krell-2005-02.png
 shots := $(patsubst %,web/sync/%,$(shots))
 web_pics := web/sync/paraslash.png web/sync/paraslash.ico
        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 \
+web_misc := overview.pdf versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 PUBLIC_KEY \

        key.anonymous para.css
 web_misc := $(patsubst %,web/sync/%,$(web_misc))
 web_man := web/sync/man
        key.anonymous para.css
 web_misc := $(patsubst %,web/sync/%,$(web_misc))
 web_man := web/sync/man


@@ -264,11 +265,12 @@ maintainer-clean: distclean
 
 
 install: all
 
 
 install: all

-       mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR) $(VARDIR)
+       mkdir -p $(BINDIR) $(FONTDIR) $(PICDIR) $(MANDIR)

        $(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)
        $(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)

+       mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain

 
 @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages)
        rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)
 
 @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: $(tarball_add) $(man_pages)
        rm -rf $(tarball_pfx).tar.bz2 $(tarball_pfx)


@@ -305,7 +307,7 @@ web/sync/%.ico: pics/web/%.ico web/sync
        cp $< $@
 web/sync/para.css: web/para.css web/sync
        cp $< $@
        cp $< $@
 web/sync/para.css: web/para.css web/sync
        cp $< $@

-web/sync/versions/paraslash-git.tar.bz2: paraslash-git.tar.bz2 web/sync
+web/sync/versions/@PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2: @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.bz2 web/sync

        cp -a versions web/sync && cp $< $@
 web/sync/overview.pdf: skencil/overview.pdf web/sync
        cp $< $@
        cp -a versions web/sync && cp $< $@
 web/sync/overview.pdf: skencil/overview.pdf web/sync
        cp $< $@