From 1f4994a72dab2e29eeec7acebf5e62a325ca6412 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Mon, 15 Jun 2009 00:10:18 +1200 Subject: [PATCH] Author: Alex Rousskov 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. --- errors/Makefile.am | 2 +- helpers/basic_auth/MSNT/Makefile.am | 2 +- src/Makefile.am | 4 ++-- tools/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/errors/Makefile.am b/errors/Makefile.am index eca2c44d47..98c013871c 100644 --- a/errors/Makefile.am +++ b/errors/Makefile.am @@ -43,7 +43,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 f6db8a48f1..6d76ddcc84 100644 --- a/helpers/basic_auth/MSNT/Makefile.am +++ b/helpers/basic_auth/MSNT/Makefile.am @@ -47,5 +47,5 @@ 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 = -- 2.47.3