From: Bian Naimeng <biannm@cn.fujitsu.com>
Date: Wed, 7 Aug 2013 03:33:19 +0000 (+0800)
Subject: bash: reference acl*.m4 from ${S}
X-Git-Tag: 2015-4~5598
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b296e7412a45f0c07b4f843784211ef0f66221e6;p=openembedded-core.git

bash: reference acl*.m4 from ${S}

bash: reference acl*.m4 from ${S}.

The build directory had been moved to ${WORKDIR}/build,
so we should reference acl*.m4 from ${S}.
Otherwise, the following configure error will be caught.

  | cat: aclocal.m4: No such file or directory
  | ERROR: Function failed: do_configure (log file is located at ...)

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 2f4519cdda..64b476f4fb 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -20,8 +20,8 @@ export AUTOHEADER = "true"
 RDEPENDS_${PN}-ptest += "make"
 
 do_configure_prepend () {
-	if [ ! -e acinclude.m4 ]; then
-		cat aclocal.m4 > acinclude.m4
+	if [ ! -e ${S}/acinclude.m4 ]; then
+		cat ${S}/aclocal.m4 > ${S}/acinclude.m4
 	fi
 }