Support expanded archives in multi‐step data

When attempting to delete outdated files, if there is an exact match
for a line in `build/data.out`, prevent checking for nested files.
Previously, these lines would match, but `find` would keep descending
into them, so the directories would not be deleted but all files inside
would be.

diff --git a/GNUmakefile b/GNUmakefile
index fac149164e2a1152f8c83d22ab496702c2a3dbf6..563426489af0e78109b07d1b5316cdd18e8f1f56 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -807,7 +807,7 @@ clean :
 ifneq ($(twostep),)
 # Build the data and remove outdated data files.
 data : $(BUILDDIR)/data.out
 ifneq ($(twostep),)
 # Build the data and remove outdated data files.
 data : $(BUILDDIR)/data.out

-       $(silent)$(FIND) $(call quote,$(BUILDDIR)/data/public) '!' -exec $(GREP) -F -q -x '{}' $(call quote,$<) ';' -a '(' -type d -o -print ')' | $(xargsmultiquote) | $(XARGS) -E '' $(RM)
+       $(silent)$(FIND) $(call quote,$(BUILDDIR)/data/public) '!' '(' -exec $(GREP) -F -q -x '{}' $(call quote,$<) ';' -a -prune ')' -a '(' -type d -o -print ')' | $(xargsmultiquote) | $(XARGS) -E '' $(RM)

 endif
 
 # Provide help.
 endif
 
 # Provide help.