(all-headers): Instead of removing rpcsvc/%, use $(wildcard) to remove all

headers that don't exist at top level, but preserve top-level $(headers).

1 files changed, 2 insertions, 5 deletions

diff --git a/Make-dist b/Make-dist
index 0c4ca31563..1df32e2ddb 100644
--- a/Make-dist
+++ b/Make-dist
@@ -46,11 +46,8 @@ else
 +distinfo := $(shell MAKEFLAGS= MFLAGS= $(MAKE) -s no_deps=t no_ir=t \
 		     echo-distinfo | grep -v '^make')
 all-headers := $(patsubst +header+%,%,$(filter +header+%,$(+distinfo)))
-# Filter out the generated rpc headers; they don't have top-level indirections.
-# It is not safe to use `$(wildcard $(all-headers))' to ignore headers
-# without top-level indirections because some of $(all-headers) might need
-# to be found in sysdeps/.
-all-headers := $(filter-out rpcsvc/%,$(all-headers))
+# Ignore subdir headers without top-level indirections.
+all-headers := $(sort $(headers) $(wildcard $(all-headers)))
 +subdir-nodist := $(patsubst +nodist+%,%,$(filter +nodist+%,$(+distinfo)))
 +subdir-headers := $(filter-out $(headers),$(all-headers))
 endif