Use find -path -or -name to match basenames of files in INSTALL_MASK

as suggested by solar in bug #219286, comment #8. (trunk r10212)

svn path=/main/branches/2.1.2/; revision=10213

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index e8ab7b05c24cfd3c2c18354a6476008cef62f1a4..ae27268cfdbc985292281059af292fbd1ddabf43 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -377,7 +377,8 @@ install_mask() {
                rm -Rf "${root}"/${no_inst} >&/dev/null
 
                # we also need to handle globs (*.a, *.h, etc)
-               find "${root}" -path "${no_inst}" -exec rm -fR {} \; >/dev/null
+               find "${root}" \( -path "${no_inst}" -or -name "${no_inst}" \) \
+                       -exec rm -fR {} \; >/dev/null
        done
        # set everything back the way we found it
        set +o noglob