From d4ba8419627514b1b65b0facd0ebb4e4f63aecf7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 21 Apr 2006 20:39:12 +0000 Subject: documentation update git-svn-id: file:///home/lennart/svn/public/paman/trunk@56 cdefa82f-4ce1-0310-97f5-ab6066f37c3c --- Makefile.am | 5 +---- bootstrap.sh | 31 ++++++++++++++++++++++--------- configure.ac | 4 ++-- doc/README.html.in | 21 ++++++++++++--------- doc/style.css | 15 ++++----------- 5 files changed, 41 insertions(+), 35 deletions(-) diff --git a/Makefile.am b/Makefile.am index f084ca4..e5c5d80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,9 +33,6 @@ homepage: all dist mkdir -p $$HOME/homepage/private/projects/paman cp paman-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/paman cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/paman - cp $$HOME/homepage/private/projects/paman/README.html $$HOME/homepage/private/projects/paman/index.html - -distcleancheck: - @: + ln -sf README.html $$HOME/homepage/private/projects/paman/index.html .PHONY: homepage distcleancheck diff --git a/bootstrap.sh b/bootstrap.sh index 62135f7..cf3c414 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -17,28 +17,41 @@ # along with Polypaudio Manager; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +VERSION=1.9 + run_versioned() { local P - type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1" + local V + + V=$(echo "$2" | sed -e 's,\.,,g') + + if [ -e "`which $1$V`" ] ; then + P="$1$V" + else + if [ -e "`which $1-$2`" ] ; then + P="$1-$2" + else + P="$1" + fi + fi shift 2 "$P" "$@" } +set -ex + if [ "x$1" = "xam" ] ; then - set -ex - run_versioned automake 1.7 -a -c --foreign + run_versioned automake "$VERSION" -a -c --foreign ./config.status else - set -ex - rm -rf autom4te.cache rm -f config.cache - run_versioned aclocal 1.7 - autoheader - run_versioned automake 1.7 -a -c --foreign - autoconf -Wall + run_versioned aclocal "$VERSION" + run_versioned autoconf 2.59 -Wall + run_versioned autoheader 2.59 + run_versioned automake "$VERSION" -a -c --foreign CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@" diff --git a/configure.ac b/configure.ac index c227e56..90ec48a 100644 --- a/configure.ac +++ b/configure.ac @@ -20,10 +20,10 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. AC_PREREQ(2.57) -AC_INIT([paman],[0.7],[mzcnzna (at) 0pointer (dot) de]) +AC_INIT([paman],[0.8],[mzcnzna (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/paman.cc]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign -Wall]) +AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/paman/]) diff --git a/doc/README.html.in b/doc/README.html.in index d886227..516f3c6 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -10,13 +10,13 @@

Polypaudio Manager @PACKAGE_VERSION@

-

Copyright 2004 Lennart Poettering <@PACKAGE_BUGREPORT@>

+

Copyright 2004-2006 Lennart Poettering <@PACKAGE_BUGREPORT@>