backport timestamp check fixes from r20856

SVN-Revision: 20857

diff --git a/include/depends.mk b/include/depends.mk
index 4c31eb39843de6b6e65763e93162d54bb78c2b87..65e9b25d5e564499d4bf26d6ba871fbcffca39f5 100644 (file)
--- a/include/depends.mk
+++ b/include/depends.mk
@@ -11,7 +11,7 @@
 #      3: tempfile for file listings
 #      4: find options
 
-DEP_FINDPARAMS := -x "*.svn*" -x ".*" -x "*.svn*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check"
+DEP_FINDPARAMS := -x "*/.svn*" -x ".*" -x "*:*" -x "*\!*" -x "* *" -x "*\\\#*" -x "*/.*_check"
 
 find_md5=find $(1) -type f $(patsubst -x,-and -not -path,$(DEP_FINDPARAMS) $(2)) | md5s
 

diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index 3bf057151f43d0725822066e7acbbd6daa721ccc..e24d8149d9c8754ba72e8918e09cd9c390427251 100755 (executable)
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -14,7 +14,7 @@ sub get_ts($$) {
        my $ts = 0;
        my $fn = "";
        $path .= "/" if( -d $path);
-       open FIND, "find $path -type f -and -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
+       open FIND, "find $path -type f -and -not -path \\*/.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
        while (<FIND>) {
                chomp;
                my $file = $_;