.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 572b68f0d..0d7df92e4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -949,7 +949,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
 	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
@@ -1729,9 +1729,11 @@ sc_tight_scope: $(all_programs)
 	    | grep -Ev -f $$t &&					\
 	  { echo 'the above functions should have static scope' 1>&2;	\
 	    exit 1; } || : ;						\
-	printf '^program_name$$\n' > $$t;				\
+	( printf '^program_name$$\n';					\
+	  sed -n 's/^extern int \([^ ][^ ]*\);$$/^\1$$/p'		\
+	    $(noinst_HEADERS) ) > $$t;					\
 	nm -e *.$(OBJEXT)						\
-	    | sed -n 's/.* B //p'					\
+	    | sed -n 's/.* [BD] //p'					\
 	    | grep -Ev -f $$t &&					\
 	  { echo 'the above variables should have static scope' 1>&2;	\
 	    exit 1; } || :