Make distuninstallcheck work when $(RM) contains spaces (e.g., rm -f). We must quote $(RM) value when passing it to scripts/remove-cfg.sh The bug was detected by running test-builds.sh. === modified file 'errors/Makefile.am' --- errors/Makefile.am 2009-06-12 05:07:44 +0000 +++ errors/Makefile.am 2009-06-12 16:24:44 +0000 @@ -98,7 +98,7 @@ done; \ fi \ done; - @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh $(RM) $(DESTDIR)$(DEFAULT_STYLESHEET) + @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_STYLESHEET) rm -f $(DESTDIR)$(DEFAULT_STYLESHEET).default # undocumented hack. You can use this target to create multi-lingual === modified file 'helpers/basic_auth/MSNT/Makefile.am' --- helpers/basic_auth/MSNT/Makefile.am 2009-04-23 09:52:10 +0000 +++ helpers/basic_auth/MSNT/Makefile.am 2009-06-12 16:24:44 +0000 @@ -47,6 +47,6 @@ fi uninstall-local: - @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh $(RM) $(DESTDIR)$(MSNTAUTH_CONF) + @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(MSNTAUTH_CONF) $(RM) -f $(DESTDIR)$(MSNTAUTH_CONF).default === modified file 'src/Makefile.am' --- src/Makefile.am 2009-06-01 12:31:43 +0000 +++ src/Makefile.am 2009-06-12 16:24:44 +0000 @@ -790,8 +790,8 @@ $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) uninstall-local: - @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh $(RM) $(DESTDIR)$(DEFAULT_MIME_TABLE) - @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh $(RM) $(DESTDIR)$(DEFAULT_CONFIG_FILE) + @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_MIME_TABLE) + @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_CONFIG_FILE) CLEANFILES += cf_gen_defines.h cf.data cf_parser.h squid.conf.default squid.conf.documented \ globals.cc string_arrays.c repl_modules.cc DiskIO/DiskIOModules_gen.cc \ === modified file 'tools/Makefile.am' --- tools/Makefile.am 2009-04-23 09:52:10 +0000 +++ tools/Makefile.am 2009-06-12 16:24:44 +0000 @@ -47,7 +47,7 @@ fi uninstall-local: - @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh $(RM) $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) + @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) $(RM) -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default DISTCLEANFILES =