From d558cce2164e78cae49f55a73c95fa4ce24df7c3 Mon Sep 17 00:00:00 2001
Message-Id: <d558cce2164e78cae49f55a73c95fa4ce24df7c3.1715200576.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 13 Jan 2008 14:17:50 +0000
Subject: [PATCH] prepare no longer runs configure (and therefore does not
 impose its idea of sysconfdir and localestatedir).
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 README.developers | 3 ++-
 debian/rules      | 7 ++++---
 prepare           | 6 ++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.developers b/README.developers
index f7d9cfd..9e73d01 100644
--- a/README.developers
+++ b/README.developers
@@ -21,7 +21,8 @@ Building:
    * Compiled versions of configure and the makefiles are including in bzr, so
      if you didn't use a source tarball, you must start as follows:
 
-        bash ./prepare -C
+        bash ./prepare
+        ./configure -C
         make
 
    * On FreeBSD you must use gmake.
diff --git a/debian/rules b/debian/rules
index c11698c..551014d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,10 @@ FAKEROOT=fakeroot
 # run if building from a checkout rather than a tarball.
 build:
 	@if test ! -f configure; then \
-	  echo ./prepare ${CONFIGURE} ${CONFIGURE_EXTRA};\
-	  ./prepare ${CONFIGURE} ${CONFIGURE_EXTRA};\
-	elif test ! -f config.status; then \
+	  echo ./prepare;\
+	  ./prepare;\
+	fi
+	@if test ! -f config.status; then \
 	  echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
 	  ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
 	else\
diff --git a/prepare b/prepare
index 48337ea..e9e91c7 100755
--- 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, 2005, 2006, 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 "$@"
+
-- 
[mdw]