From fc97ab953e517b90e1eed4c5d752d9548d1ac22b Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Sun, 15 Aug 2010 20:31:50 +0200
Subject: ptxd_make_world_install: replace binconfig stuff before copying to
 sysroot

Some configure scripts may look for <pkg>-config in <sysroot>/usr/bin
This can happen when setting --<pkg>dir=<sysroot>/usr. So having
'@SYSROOT@' in <sysroot>/usr/bin/<pkg>-config is not good.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 scripts/lib/ptxd_make_world_install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh
index 7599ecd24..38e0716b3 100644
--- a/scripts/lib/ptxd_make_world_install.sh
+++ b/scripts/lib/ptxd_make_world_install.sh
@@ -153,8 +153,6 @@ ptxd_make_world_install_post() {
 	sed -i -e "s:@SYSROOT@:${pkg_sysroot_dir}:g" &&
     check_pipe_status &&
 
-    cp -dprf -- "${pkg_pkg_dir}"/* "${pkg_sysroot_dir}" &&
-
     # fix *-config and copy into sysroot_cross for target packages
     local config &&
     find "${pkg_pkg_dir}" ! -type d -name "${pkg_binconfig_glob}" | while read config; do
@@ -162,6 +160,8 @@ ptxd_make_world_install_post() {
 	if [ "${pkg_type}" = "target" ]; then
 	    cp -P -- "${config}" "${PTXDIST_SYSROOT_CROSS}/bin" || return
 	fi
-    done
+    done &&
+
+    cp -dprf -- "${pkg_pkg_dir}"/* "${pkg_sysroot_dir}"
 }
 export -f ptxd_make_world_install_post
-- 
cgit v1.2.3