Work around stupid excessively strict warning in GCC 4.4.

[disorder] / prepare

diff --git a/prepare b/prepare
index 48337ea5d5082dc9ce3f59ac1e1ba76086ef9420..dd3de9b8628e15ca5db3890040ecd815f333f329 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -1,31 +1,28 @@
 #! /bin/bash
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 set -e
-set -x
 srcdir=$(dirname $0)
 here=$(pwd)
 cd $srcdir
 rm -f COPYING
-for f in /usr/share/common-licenses/GPL-2 $HOME/doc/GPL-2; do
+for f in /usr/share/common-licenses/GPL-3 $HOME/doc/GPL-3 $HOME/Documents/GPL-3; do
   if test -e "$f"; then
     ln -s "$f" COPYING
     break
@@ -41,5 +38,4 @@ autoconf
 autoheader
 automake -a || true            # for INSTALL
 automake --foreign -a
-cd "$here"
-$srcdir/configure --sysconfdir=/etc --localstatedir=/var "$@"
+