Attachment 77653 Details for Bug 59705 – Fix out of source builddir - autogen

[patch] Fix out of source builddir - autogen

0001-build-fix-out-of-source-builddir-autogen.sh.txt (text/plain), 1.15 KB, created by Alban Browaeys on 2013-04-09 08:04:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alban Browaeys

Created: 2013-04-09 08:04:56 UTC

Size: 1.15 KB

patch

obsolete

>From 8449dcf0bc98c5ddac55710bd07eba5fd454d587 Mon Sep 17 00:00:00 2001
>From: Alban Browaeys <prahal@yahoo.com>
>Date: Tue, 22 Jan 2013 11:06:41 +0100
>Subject: [PATCH] build: fix out of source builddir - autogen.sh
>
>source tools (autoreconf, gtkdocize) are run
>from source directory while build tools (configure) are run from
>builddir (while still located in the sourcedir).
>---
> autogen.sh | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
>diff --git a/autogen.sh b/autogen.sh
>index 3184e69..a47248c 100755
>--- a/autogen.sh
>+++ b/autogen.sh
>@@ -1,7 +1,8 @@
> #!/bin/sh
> set -e
> 
>-gtkdocize
>+test -n "$srcdir" || srcdir=`dirname "$0"`
>+test -n "$srcdir" || srcdir=.
> 
> if test -n "$AUTOMAKE"; then
>     : # don't override an explicit user request
>@@ -16,7 +17,11 @@ elif automake-1.11 --version >/dev/null 2>/dev/null && \
>     export ACLOCAL
> fi
> 
>-autoreconf -i -f
>+(
>+    cd "$srcdir"
>+    gtkdocize
>+    autoreconf -i -f
>+)
> 
> # Honor NOCONFIGURE for compatibility with gnome-autogen.sh
> if test x"$NOCONFIGURE" = x; then
>@@ -35,5 +40,5 @@ else
> fi
> 
> if test $run_configure = true; then
>-    ./configure "$@"
>+    "$srcdir/configure" "$@"
> fi
>-- 
>1.8.2
>

Actions: View | Splinter Review

Attachments on bug 59705: 73439 | 77234 | 77653

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.