Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash/

[paraslash.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b468cc843b889248724ffc8cc3846d99123c5a2f..e26deb82da7f01122046971de2156d0a6595708e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,3 @@
-COPYRIGHT = Copyright (c) 1997-2007 by Andre Noll
-DISCLAIMER = This is free software with ABSOLUTELY NO WARRANTY. See COPYING for details.
-
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -16,7 +13,7 @@ install_sh = @install_sh@
 build_date = $(shell date)
 system = $(shell uname -rs)
 cc_version = $(shell $(CC) --version | head -n 1)
-codename = inductive resonance
+codename = neural discharge
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -46,8 +43,9 @@ CPPFLAGS += -Wshadow
 
 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
+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)
@@ -71,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
-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
@@ -102,7 +100,6 @@ slider_objs = slider.o string.o
 
 include Makefile.deps
 
-V := (@PACKAGE_STRING@, $(codename))\n$(COPYRIGHT)\n$(DISCLAIMER)
 module_ggo_opts := --set-version="(@PACKAGE_STRING@, $(codename))"
 
 grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
@@ -141,12 +138,13 @@ grab_client.cmdline.h grab_client.cmdline.c: grab_client.ggo
                audioc.ggo) O="--unamed-opts=command";; \
        esac; \
        gengetopt $$O \
+               --no-handle-version \
                --conf-parser \
                --file-name=$(*F).cmdline \
                --func-name $(*F)_cmdline_parser \
                --arg-struct-name=$(*F)_args_info \
                --set-package="para_$(subst .cmdline,,$(*F))" \
-               --set-version="$V"  < $<
+               --set-version="@PACKAGE_VERSION@"  < $<
 
 %_command_list.c %_command_list.h: %.cmd
        ./command_util.sh c < $< >$@
@@ -267,11 +265,12 @@ maintainer-clean: distclean
 
 
 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)
+       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)
@@ -308,7 +307,7 @@ web/sync/%.ico: pics/web/%.ico web/sync
        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 $< $@