build: Use the SED variable provided by configure

Signed-off-by: Ferenc Wágner <wferi@debian.org>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index f935f471623fba38e874d8ff32e8881c7a8ea3d3..66a900dcb3b577599527fdc707b21cb1c336e6f6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -132,9 +132,9 @@ $(SPEC): $(SPEC).in
                numcomm=""; \
        else \
                gitver="$(shell git describe --abbrev=4 --match='v*' HEAD 2>/dev/null)" && \
-               rpmver=`echo $$gitver | sed -e "s/^v//" -e "s/-.*//g"` && \
-               alphatag=`echo $$gitver | sed -e "s/.*-//" -e "s/^g//"` && \
-               vtag=`echo $$gitver | sed -e "s/-.*//g"` && \
+               rpmver=`echo $$gitver | $(SED) -e "s/^v//" -e "s/-.*//g"` && \
+               alphatag=`echo $$gitver | $(SED) -e "s/.*-//" -e "s/^g//"` && \
+               vtag=`echo $$gitver | $(SED) -e "s/-.*//g"` && \
                numcomm=`git rev-list $$vtag..HEAD | wc -l` && \
                git update-index --refresh > /dev/null 2>&1 || true && \
                dirty=`git diff-index --name-only HEAD 2>/dev/null`; \
@@ -144,7 +144,7 @@ $(SPEC): $(SPEC).in
        if [ "$$alphatag" = "$$gitver" ]; then alphatag=""; fi && \
        if [ -n "$$alphatag" ]; then alphatag="%global alphatag $$alphatag"; fi && \
        if [ -n "$$dirty" ]; then dirty="%global dirty dirty"; fi && \
-       sed \
+       $(SED) \
                -e "s#@version@#$$rpmver#g" \
                -e "s#@ALPHATAG@#$$alphatag#g" \
                -e "s#@NUMCOMM@#$$numcomm#g" \

diff --git a/conf/logrotate/Makefile.am b/conf/logrotate/Makefile.am
index 717877982a3a1957ce71088ee26fc65ac0f2945b..4f7b7536769f6e3a38f0c1c8e610f6b6c2a5fc58 100644 (file)
--- a/conf/logrotate/Makefile.am
+++ b/conf/logrotate/Makefile.am
@@ -36,13 +36,13 @@ EXTRA_DIST          = corosync-reopen.in corosync-copytruncate.in
 
 if HAVE_QB_LOG_FILE_REOPEN
 corosync: corosync-reopen.in
-       sed -e 's#@''LOGDIR@#${LOGDIR}#g' \
-           -e 's#@''SBINDIR@#$(sbindir)#g' \
-           $< > $@
+       $(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \
+              -e 's#@''SBINDIR@#$(sbindir)#g' \
+              $< > $@
 else
 corosync: corosync-copytruncate.in
-       sed -e 's#@''LOGDIR@#${LOGDIR}#g' \
-           $< > $@
+       $(SED) -e 's#@''LOGDIR@#${LOGDIR}#g' \
+              $< > $@
 endif
 
 logrotatecorosyncdir    = ${LOGROTATEDIR}

diff --git a/init/Makefile.am b/init/Makefile.am
index 6fbd676a7da092799556facfb565fce6401803a7..42199955b0f6bbadc9df3089228703a15d8cbbfc 100644 (file)
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -48,7 +48,7 @@ endif
 
 %: %.in Makefile
        rm -f $@-t $@
-       cat $< | sed \
+       cat $< | $(SED) \
                -e 's#@''SBINDIR@#$(sbindir)#g' \
                -e 's#@''BINDIR@#$(bindir)#g' \
                -e 's#@''SYSCONFDIR@#$(sysconfdir)#g' \

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 29cb59c6d55f2979e91d2dce9373ff47397e56ca..ca6984c0adb1e17e28cf1fcae12abca75f11d254 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -31,7 +31,7 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 # Functions to be used at link time (target.lo)
-get_libname=$(shell echo $1 | sed -e "s/\.lo//")
+get_libname=$(shell echo $1 | $(SED) -e "s/\.lo//")
 uc=$(shell echo $(call get_libname,$1) | tr a-z A-Z)
 get_soname=$(subst .,:,$(if $($(call uc,$1)_SONAME),$($(call uc,$1)_SONAME),$(SONAME)))
 get_major=$(firstword $(subst :, ,$(call get_soname,$1)))

diff --git a/man/Makefile.am b/man/Makefile.am
index 87f62d8cd574fc6f65c7683967b1f6fac2facdbe..4a1822c313a44cf891d20dbc6e60e5538060d87c 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -156,9 +156,9 @@ HTML_DOCS           = $(dist_man_MANS:%=%.html) $(man_MANS:%=%.html)
        cat ${top_srcdir}/man/$(autogen_common) >> $@-t-t && \
        awk -v p=0 "(\$$1 ~ /@COMMONIPCERRORS@/){p = 1} {if(p==1)print}" ${top_srcdir}/man/$@.in >> $@-t-t && \
        cat $@-t-t | \
-               sed -e 's#@BUILDDATE@#'$$date'#g' \
-                   -e 's#@COMMONIPCERRORS@##g' \
-                   > $@-t && \
+               $(SED) -e 's#@BUILDDATE@#'$$date'#g' \
+                      -e 's#@COMMONIPCERRORS@##g' \
+                      > $@-t && \
        rm -f $@-t-t && \
        mv $@-t $@
 

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index c627355d5b967c17e00d471c5b2421fa9968e9a9..0776bc2b419c14009d5e1e57ebe637e40759dfe2 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -47,7 +47,7 @@ CLEANFILES = $(pkgconfig_DATA)
 
 lib%.pc: libtemplate.pc.in Makefile
        rm -f $@-t $@
-       sed \
+       $(SED) \
                -e 's#@''PREFIX@#$(exec_prefix)#g' \
                -e 's#@''LIBDIR@#$(libdir)#g' \
                -e 's#@''LIBVERSION@#$(VERSION)#g' \
@@ -58,7 +58,7 @@ lib%.pc: libtemplate.pc.in Makefile
 
 %: %.in Makefile
        rm -f $@-t $@
-       sed \
+       $(SED) \
                -e 's#@''PREFIX@#$(exec_prefix)#g' \
                -e 's#@''LIBDIR@#$(libdir)#g' \
                -e 's#@''LIBVERSION@#$(VERSION)#g' \

diff --git a/test/Makefile.am b/test/Makefile.am
index 131d6754fc23d6db950229df1573a65f095e9cbe..1994a3c51a09c949bb9521ecdace672f923f1467 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -63,7 +63,7 @@ cpgverify_LDADD               = $(LIBQB_LIBS) $(top_builddir)/lib/libcpg.la -lz
 endif
 
 ploadstart: ploadstart.sh
-       sed -e 's#@''BASHPATH@#${BASHPATH}#g' $< > $@
+       $(SED) -e 's#@''BASHPATH@#${BASHPATH}#g' $< > $@
        chmod 755 $@
 
 LINT_FILES1:=$(filter-out sa_error.c, $(wildcard *.c))

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8825498571055adf7d2f33ff6898784b00ad9d82..079388474a385b281b51a5d256688a440cb9b3a2 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -49,12 +49,12 @@ EXTRA_DIST          = corosync-xmlproc.sh \
                           corosync-blackbox.sh
 
 corosync-xmlproc: corosync-xmlproc.sh
-       sed -e 's#@''DATADIR@#${datadir}#g' \
-           -e 's#@''BASHPATH@#${BASHPATH}#g' \
-           $< > $@
+       $(SED) -e 's#@''DATADIR@#${datadir}#g' \
+              -e 's#@''BASHPATH@#${BASHPATH}#g' \
+              $< > $@
 
 corosync-blackbox: corosync-blackbox.sh
-       sed -e 's#@''LOCALSTATEDIR@#${localstatedir}#g' $< > $@
+       $(SED) -e 's#@''LOCALSTATEDIR@#${localstatedir}#g' $< > $@
 
 corosync_cmapctl_LDADD = $(LIBQB_LIBS) $(top_builddir)/lib/libcmap.la