Synchronize with DisOrder 4.1

[disorder] / prepare

diff --git a/prepare b/prepare
index 48337ea5d5082dc9ce3f59ac1e1ba76086ef9420..f38be5b101c4f007dacfc3f1fa635fc15ae051d9 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -1,7 +1,7 @@
 #! /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
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 #
 
 set -e
-set -x
 srcdir=$(dirname $0)
 here=$(pwd)
 cd $srcdir
@@ -41,5 +40,4 @@ autoconf
 autoheader
 automake -a || true            # for INSTALL
 automake --foreign -a
-cd "$here"
-$srcdir/configure --sysconfdir=/etc --localstatedir=/var "$@"
+