prepare no longer runs configure (and therefore does not impose its

idea of sysconfdir and localestatedir).

diff --git a/README.developers b/README.developers
index f7d9cfd5d6654977c0b31d28f04a876c716e1eae..9e73d01084f0d1cb660018b43d5528850348c72f 100644 (file)
--- 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:
 
    * 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.
         make
 
    * On FreeBSD you must use gmake.

diff --git a/debian/rules b/debian/rules
index c11698c235564b4ebcde79700feb117d601143c5..551014d91be72ac7f897a469dca06a4a3aea6ac3 100755 (executable)
--- 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 \
 # 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\
          echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
          ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
        else\

diff --git a/prepare b/prepare
index 48337ea5d5082dc9ce3f59ac1e1ba76086ef9420..e9e91c72b8c4f5ca7accaeb06ce34328ae028580 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -1,7 +1,7 @@
 #! /bin/bash
 #
 # This file is part of DisOrder.
 #! /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
 #
 # 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 -e

-set -x

 srcdir=$(dirname $0)
 here=$(pwd)
 cd $srcdir
 srcdir=$(dirname $0)
 here=$(pwd)
 cd $srcdir


@@ -41,5 +40,4 @@ autoconf
 autoheader
 automake -a || true            # for INSTALL
 automake --foreign -a
 autoheader
 automake -a || true            # for INSTALL
 automake --foreign -a

-cd "$here"
-$srcdir/configure --sysconfdir=/etc --localstatedir=/var "$@"
+