Define AT_SYS_M4DIR for autotools.eclass to always have EPREFIX/usr/share/aclocal...

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 7db3212250707941c6fddaaf5e72b6f0935df0d1..c95b97b3994e73f59779f9af9a13421c886a7f01 100644 (file)
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.308 2011/12/15 18:35:49 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.309 2011/12/15 20:50:52 grobian Exp $
+
+  15 Dec 2011; Fabian Groffen <grobian@gentoo.org> profile.bashrc:
+  Define AT_SYS_M4DIR for autotools.eclass to always have
+  EPREFIX/usr/share/aclocal for cross-EPREFIX builds (migration from Prefix
+  local eclass modification)
 
   15 Dec 2011; Jeremy Olexa <darkside@gentoo.org> linux/profile.bashrc:
   Fix bug 289757 (again). Use ldd, use EPATCH_EXCLUDE, match new patch name as

diff --git a/profiles/prefix/profile.bashrc b/profiles/prefix/profile.bashrc
index 0ee8262ec7bfc01fc9f26dc6a559c6423db6dc03..819330e84b0da07676b077d5dddb229533605394 100644 (file)
--- a/profiles/prefix/profile.bashrc
+++ b/profiles/prefix/profile.bashrc
@@ -1,5 +1,5 @@
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Id: profile.bashrc,v 1.2 2009/07/22 16:29:50 haubi Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Id: profile.bashrc,v 1.3 2011/12/15 20:50:52 grobian Exp $
 
 # Hack to avoid every package that uses libiconv/gettext
 # install a charset.alias that will collide with libiconv's one
@@ -20,3 +20,10 @@ prefix-post_src_install() {
 # until there is the registration mechanism.
 profile-post_src_install() { prefix-post_src_install ; }
         post_src_install() { prefix-post_src_install ; }
+
+# Always add ${EPREFIX}/usr/share/aclocal to accommodate situations where
+# aclocal comes from another EPREFIX (for example cross-EPREFIX builds).
+# Note: AT_SYS_M4DIR gets eval-ed
+[[ -d ${EPREFIX}/usr/share/aclocal ]] && \
+       AT_SYS_M4DIR+=' -I ${EPREFIX}/usr/share/aclocal'
+