rmdir sys || exit 0?

[Karl Berry]

I find that make clean fails for me in texinfo's gnulib, because my
gnulib/lib/sys/ directory is not empty, just because it contains a CVS dir:

$ make clean
...
make[1]: Entering directory `/u/karl/gnu/src/texinfo/gnulib/lib'
test -z "" || rm -f 
test -z "libgnu.a" || rm -f libgnu.a
test -z "" || rm -f 
rm -f *.o
test -z "core *.stackdump alloca.h alloca.h-t getopt.h getopt.h-t stdint.h 
stdint.h-t stdlib.h stdlib.h-t string.h string.h-t sys/stat.h sys/stat.h-t 
sys/time.h sys/time.h-t unistd.h unistd.h-t wchar.h wchar.h-t wctype.h 
wctype.h-t" || rm -f core *.stackdump alloca.h alloca.h-t getopt.h getopt.h-t 
stdint.h stdint.h-t stdlib.h stdlib.h-t string.h string.h-t sys/stat.h 
sys/stat.h-t sys/time.h sys/time.h-t unistd.h unistd.h-t wchar.h wchar.h-t 
wctype.h wctype.h-t
rmdir sys
rmdir: sys: Directory not empty
make[1]: *** [mostlyclean-local] Error 1
$ ls gnulib/lib/sys
CVS/

I think this is coming from this line in gnulib-tool (1444 or so):

echo "      echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\"

Can we switch to something like

echo "      echo \"rmdir \$\$dir\"; (rmdir \$\$dir || exit 0); \\"

?  That leaves the diagnostic but lets things continue.  It seems pretty
harmless to me if the rmdir fails.

Thanks,
Karl