diff options
author | Alban Browaeys <prahal@yahoo.com> | 2013-06-15 01:01:29 +0200 |
---|---|---|
committer | Pavel Šimerda <psimerda@redhat.com> | 2013-06-15 01:06:59 +0200 |
commit | 290c51da6839525213808f9fc9617f6dd908e263 (patch) | |
tree | 0128f3e91f7cc18ad76e54fffdbcf42c0eb3c59d /autogen.sh | |
parent | c73e891a4cb69ad638a63f6bfc95900dfac67270 (diff) | |
download | NetworkManager-290c51da6839525213808f9fc9617f6dd908e263.tar.gz |
build: out of src build directory fix.
Split srcdir work and builddir work more explicitely,
and fixes a newly introduced issue (git work done out
of the srcdir section).
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/autogen.sh b/autogen.sh index eef15b1bec..3b4c281d76 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,6 +3,9 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. + +olddir=`pwd` + REQUIRED_AUTOMAKE_VERSION=1.9 PKG_NAME=NetworkManager @@ -13,17 +16,18 @@ PKG_NAME=NetworkManager exit 1 } +cd $srcdir + # Fetch submodules if needed echo "+ Setting up submodules" git submodule init git submodule update -(cd $srcdir; - gtkdocize || exit 1 - autopoint --force - AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose -) +gtkdocize || exit 1 +autopoint --force +AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose +cd $olddir if test -z "$NOCONFIGURE"; then $srcdir/configure --enable-maintainer-mode "$@" fi |