Accumulated 2.60 changes going into git
diff --git a/bld/pkg-wrapper b/bld/pkg-wrapper
index 4f3b76b..c32034e 100755
--- a/bld/pkg-wrapper
+++ b/bld/pkg-wrapper
@@ -3,7 +3,7 @@
 search=$1
 shift
 
-if grep "^\#.*define.*$search" config.h 2>&1 >/dev/null || \
+if grep "^\#[[:space:]]*define[[:space:]]*$search" config.h 2>&1 >/dev/null || \
    grep $search 2>&1 >/dev/null ; then
   exec $*
 fi