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

Conflicts:

	Makefile.in

diff --combined Makefile.in
index b468cc843b889248724ffc8cc3846d99123c5a2f,7dd99ac2b7fbd70965c1004934b8ddecc3e0cd8d..5afade9fcd98759114947ab0f9fbec4e329d2b21
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -1,6 -1,3 +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@
  
@@@ -102,7 -99,6 +99,6 @@@ slider_objs = slider.o string.
  
  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 -137,13 +137,13 @@@
                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 < $< >$@
@@@ -158,20 -155,16 +155,20 @@@
  server_command_lists = server_command_list.man random_selector_command_list.man \
        playlist_selector_command_list.man mysql_selector_command_list.man
  man/man1/para_server.1: para_server $(server_command_lists)
 +      mkdir -p man/man1
        opts="-N `for i in $(server_command_lists); do echo "-i $$i"; done`"; \
        help2man $$opts ./para_server > $@
  
  man/man1/para_audiod.1: para_audiod audiod_command_list.man
 +      mkdir -p man/man1
        help2man -N -i audiod_command_list.man ./para_audiod > $@
  
  man/man1/%.1: %
 +      mkdir -p man/man1
        help2man -N ./$< > $@
  
  man/html/%.html: man/man1/%.1
 +      mkdir -p man/html
        man2html $< > $@