diff --git a/scripts/build b/scripts/build
index 4f8da469a7..0a0c3d5ea7 100755
--- a/scripts/build
+++ b/scripts/build
@@ -356,7 +356,6 @@ if [ ! -f $STAMP ]; then
           elif [ "$TARGET" = "host" ]; then
             make install $PKG_MAKEINSTALL_OPTS_HOST
           elif [ "$TARGET" = "init" ]; then
-            $MAKEINSTALL $PKG_MAKEINSTALL_OPTS_INIT
             make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_INIT
           elif [ "$TARGET" = "bootstrap" ]; then
             $MAKEINSTALL $PKG_MAKEINSTALL_OPTS_BOOTSTRAP
@@ -370,22 +369,22 @@ if [ ! -f $STAMP ]; then
 
         if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then
           if [ -d $INSTALL ] ; then
-            rm -rf $INSTALL/usr/include
-            rm -rf $INSTALL/usr/lib/pkgconfig
-            rm -rf $INSTALL/usr/share/aclocal
-            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/pkgconfig
-            find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
-            find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
-            find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
-            find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
-            find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
-            find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
+            for i in $INSTALL $INSTALL/usr; do
+              rm -rf $i/include
+              rm -rf $i/lib/pkgconfig
+              rm -rf $i/share/aclocal
+              rm -rf $i/share/bash-completion
+              rm -rf $i/share/doc
+              rm -rf $i/share/gtk-doc
+              rm -rf $i/share/info
+              rm -rf $i/share/locale
+              rm -rf $i/share/man
+              rm -rf $i/share/pkgconfig
+              find $i -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
+              find $i -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
+              find $i -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
+            done
+
             find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true
 
             if [ ! "$DEBUG" = yes ]; then