summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stef@thewalter.net>2014-02-25 09:45:46 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-27 01:16:14 -0500
commit0f62019c34e546f7c069a3b9f46deaa4b1608276 (patch)
treea97af38085e1d7e0fc7a30f288de92210b21f38f
parent2141e47892cadfd48ad0896ae66831e704ec068e (diff)
autogen: Allow running autogen from a builddir != srcdir
While the configure correctly supports being run outside of the top source directory by default, it's nice if autogen.sh does too: $ git clone git://anongit.freedesktop.org/systemd/systemd $ cd systemd $ mkdir $(uname -m) $ cd $(uname -m) $ ../autogen.sh a $ make
-rwxr-xr-xautogen.sh18
1 files changed, 12 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh
index 20f013a7ac..9b4781c72f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,6 +17,10 @@
set -e
+oldpwd=$(pwd)
+topdir=$(dirname $0)
+cd $topdir
+
if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then
# This part is allowed to fail
cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
@@ -53,20 +57,22 @@ args="$args \
"
fi
+cd $oldpwd
+
if [ "x$1" = "xc" ]; then
- ./configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args
+ $topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args
make clean
elif [ "x$1" = "xg" ]; then
- ./configure CFLAGS='-g -Og -ftrapv' --enable-compat-libs --enable-kdbus $args
+ $topdir/configure CFLAGS='-g -Og -ftrapv' --enable-compat-libs --enable-kdbus $args
make clean
elif [ "x$1" = "xa" ]; then
- ./configure CFLAGS='-g -O0 -Wsuggest-attribute=pure -Wsuggest-attribute=const -ftrapv' --enable-compat-libs --enable-kdbus $args
+ $topdir/configure CFLAGS='-g -O0 -Wsuggest-attribute=pure -Wsuggest-attribute=const -ftrapv' --enable-compat-libs --enable-kdbus $args
make clean
elif [ "x$1" = "xl" ]; then
- ./configure CC=clang CFLAGS='-g -O0 -ftrapv -Wno-gnu' --enable-compat-libs --enable-kdbus $args
+ $topdir/configure CC=clang CFLAGS='-g -O0 -ftrapv -Wno-gnu' --enable-compat-libs --enable-kdbus $args
make clean
elif [ "x$1" = "xs" ]; then
- scan-build ./configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args
+ scan-build $topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args
scan-build make
else
echo
@@ -74,6 +80,6 @@ else
echo "Initialized build system. For a common configuration please run:"
echo "----------------------------------------------------------------"
echo
- echo "./configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args"
+ echo "$topdir/configure CFLAGS='-g -O0 -ftrapv' --enable-compat-libs --enable-kdbus $args"
echo
fi