From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sat, 13 Jun 2009 20:39:33 +0000 (-0600)
Subject: Make distuninstallcheck work when $(RM) contains spaces (e.g., rm -f).
X-Git-Tag: SQUID_3_2_0_1~956
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e2ea0cea8989aaf7b8103d180572d0efc0d55d3;p=thirdparty%2Fsquid.git

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 92eb968127..0c0bad8d75 100644
--- 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 c8d7901638..b4bfe2b57d 100644
--- 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 3b474eb13f..bb6e7c9616 100644
--- 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 b158011e8f..e1ddf8c894 100644
--- 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 =