From d31c44664c9cc50f2d6dae64fb455d3f1eef5224 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Thu, 12 Dec 2019 09:06:53 +0100
Subject: [PATCH] build: clean usr/local/ on packages too

Some packages use configure_target() but don't set the /usr prefix.
---
 scripts/build   | 18 +++++++++---------
 scripts/install |  5 +++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/scripts/build b/scripts/build
index 3b402e8410..a1618d85c8 100755
--- a/scripts/build
+++ b/scripts/build
@@ -445,15 +445,15 @@ export SYSROOT_PREFIX="${PKG_ORIG_SYSROOT_PREFIX}"
 
 if [ "${TARGET}" = "target" -o "${TARGET}" = "init" ]; then
   if [ -d ${INSTALL} ]; then
-    rm -rf ${INSTALL}/{usr/,}man
-    rm -rf ${INSTALL}/{usr/,}share/bash-completion
-    rm -rf ${INSTALL}/{usr/,}share/doc
-    rm -rf ${INSTALL}/{usr/,}share/gtk-doc
-    rm -rf ${INSTALL}/{usr/,}share/info
-    rm -rf ${INSTALL}/{usr/,}share/locale
-    rm -rf ${INSTALL}/{usr/,}share/man
-    rm -rf ${INSTALL}/{usr/,}share/zsh
-    rm -rf ${INSTALL}/{usr/,}var
+    rm -rf ${INSTALL}/{usr/local/,usr/,}man
+    rm -rf ${INSTALL}/{usr/local/,usr/,}share/bash-completion
+    rm -rf ${INSTALL}/{usr/local/,usr/,}share/doc
+    rm -rf ${INSTALL}/{usr/local/,usr/,}share/gtk-doc
+    rm -rf ${INSTALL}/{usr/local/,usr/,}share/info
+    rm -rf ${INSTALL}/{usr/local/,usr/,}share/locale
+    rm -rf ${INSTALL}/{usr/local/,usr/,}share/man
+    rm -rf ${INSTALL}/{usr/local/,usr/,}share/zsh
+    rm -rf ${INSTALL}/{usr/local/,usr/,}var
     find ${INSTALL} \( -name "*.orig" \
                   -o -name "*.rej" \
                   -o -name "*.o" \
diff --git a/scripts/install b/scripts/install
index 5e435600ce..f4d4ea95e0 100755
--- a/scripts/install
+++ b/scripts/install
@@ -140,6 +140,11 @@ fi
 if [ -n "${PKG_INSTALL}" -a -d "${PKG_INSTALL}" ]; then
   tar \
     -C "${PKG_INSTALL}" \
+    --exclude=./usr/local/include \
+    --exclude=./usr/local/lib/cmake \
+    --exclude=./usr/local/lib/pkgconfig \
+    --exclude=./usr/local/share/aclocal \
+    --exclude=./usr/local/share/pkgconfig \
     --exclude=./usr/include \
     --exclude=./usr/lib/cmake \
     --exclude=./usr/lib/pkgconfig \