Replace "sed" with "$(SED)" in Makefiles

diff --git a/Makefile.am b/Makefile.am
index 106c08fd0ecd60c194850f735b29365df3194511..1b861fb2a55494861c322fb741912d4da9e2f434 100644 (file)
--- 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 7baa24e05782803576311c4092d7e7cc1b2052f3..1a7b54f066351df7a1c66ec2e5b594c44d909dbe 100644 (file)
--- 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 52cf9fe61a2c67537dbcc58dbba88902e4fcb4e7..afae3aec3e488dc76e7cbec974d61d9e2fe76215 100644 (file)
--- 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 72bb16796e8d05a7f2afb08c2ce1ab28f1d4c76d..561f23bfcefabfb38f56a536134b06c9d7a135c2 100644 (file)
--- 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 $@