From 4641a075fdd5d09a3817e573779283067d348dd4 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 10 Dec 2015 12:13:11 +0100
Subject: [PATCH] Replace "sed" with "$(SED)" in Makefiles

---
 Makefile.am             | 6 +++---
 src/libpspp/automake.mk | 2 +-
 src/ui/gui/automake.mk  | 2 +-
 tests/automake.mk       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 106c08fd0e..1b861fb2a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,11 +128,11 @@ dist-hook-git: distfiles
 	fi
 # The following is based on commands for the Automake "distdir" target.
 distfiles: Makefile
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | $(SED) 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | $(SED) 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
+	  $(SED) -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" \
 	  | LC_ALL=C sort -u > $@
 CLEANFILES += distfiles gitfiles missing-distfiles
diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index 7baa24e057..1a7b54f066 100644
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -129,6 +129,6 @@ $(AM_V_at)(`LC_ALL=C TZ=UTC date`).\";" >> $@,tmp
 	$(AM_V_at)echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@,tmp
 	$(AM_V_at)echo "const char examples_dir[] = \"$(examplesdir)\";" >> $@,tmp
 	$(AM_V_at)echo "const char *const authors[] = {" >> $@,tmp
-	$(AM_V_at)sed -e 's/^/  \"/' -e 's/$$/\",/' $(top_srcdir)/AUTHORS >> $@,tmp
+	$(AM_V_at)$(SED) -e 's/^/  \"/' -e 's/$$/\",/' $(top_srcdir)/AUTHORS >> $@,tmp
 	$(AM_V_at)echo "0 };" >> $@,tmp
 	mv $@,tmp $@
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 52cf9fe61a..afae3aec3e 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -388,7 +388,7 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 	@$(MKDIR_P) src/ui/gui/include/gtk
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	  $(SED) -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_GTK_GTK_H''@|$(NEXT_GTK_GTK_H)|g' \
diff --git a/tests/automake.mk b/tests/automake.mk
index 72bb16796e..561f23bfce 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -422,7 +422,7 @@ tests_clean:
 AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) 
-	$(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp
+	$(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | $(SED) 's/@<00A0>@/ /g' > $@.tmp
 	$(AM_V_at)mv $@.tmp $@
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
@@ -471,7 +471,7 @@ valgrind_wrappers = \
 
 $(valgrind_wrappers): tests/valgrind-wrapper.in
 	@$(MKDIR_P) tests/valgrind
-	$(AM_V_GEN)sed -e 's,[@]wrap_program[@],$@,' \
+	$(AM_V_GEN)$(SED) -e 's,[@]wrap_program[@],$@,' \
 		$(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
 	$(AM_V_at)chmod +x $@.tmp
 	$(AM_V_at)mv $@.tmp $@
-- 
2.30.2