Imported Upstream version 1.2.7

[platform/upstream/harfbuzz.git] / src / check-header-guards.sh

diff --git a/src/check-header-guards.sh b/src/check-header-guards.sh
index af9fa7f..09c5ea8 100755 (executable)
--- a/src/check-header-guards.sh
+++ b/src/check-header-guards.sh
@@ -6,16 +6,15 @@ export LC_ALL
 test -z "$srcdir" && srcdir=.
 stat=0
 
-test "x$HBHEADERS" = x && HBHEADERS=`find . -maxdepth 1 -name 'hb*.h'`
-test "x$HBSOURCES" = x && HBSOURCES=`find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'`
-
+test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'`
+test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'`
 
 for x in $HBHEADERS $HBSOURCES; do
        test -f "$srcdir/$x" && x="$srcdir/$x"
-       echo "$x" | grep '[^h]$' -q && continue;
+       echo "$x" | grep -q '[^h]$' && continue;
        xx=`echo "$x" | sed 's@.*/@@'`
        tag=`echo "$xx" | tr 'a-z.-' 'A-Z_'`
-       lines=`grep "\<$tag\>" "$x" | wc -l | sed 's/[  ]*//g'`
+       lines=`grep -w "$tag" "$x" | wc -l | sed 's/[   ]*//g'`
        if test "x$lines" != x3; then
                echo "Ouch, header file $x does not have correct preprocessor guards"
                stat=1