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.

diff --git a/errors/Makefile.am b/errors/Makefile.am
index 92eb968127f27310af521adfba3a7733cdaf2f28..0c0bad8d75a6b2e5ce91c7f085114297db3ddba1 100644 (file)
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -98,7 +98,7 @@ uninstall-local:
                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

diff --git a/helpers/basic_auth/MSNT/Makefile.am b/helpers/basic_auth/MSNT/Makefile.am
index c8d790163886985a2d3dd3f58d58dea908216200..b4bfe2b57d9ad4176f068983994edf168d9347bb 100644 (file)
--- a/helpers/basic_auth/MSNT/Makefile.am
+++ b/helpers/basic_auth/MSNT/Makefile.am
@@ -47,6 +47,6 @@ install-data-local:
        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
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 3b474eb13f9b193d60fdb3e1e383ac6dce94e3b8..bb6e7c9616a6417bf2169480696eb812813257be 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -790,8 +790,8 @@ install-data-local: install-sysconfDATA install-dataDATA
        $(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 \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index b158011e8fce1fcc7011f2a7e972c08e175b6a2e..e1ddf8c894a9dd5a799ce0430c0f7b9830a69720 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -47,7 +47,7 @@ install-data-local:
        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 =