From 9be4157391edf0c5fc4ee36adfb1eb1c3bdb8e3b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 17 Mar 2010 13:33:39 -0500 Subject: [PATCH] Respect value of SED from configure We now use libtool, which calls AC_PROG_SED and sets SED as the path to a fully-functional 'sed' (which may also be called 'gsed' if GNU sed is installed alongside a proprietary version). Therefore we should respect the value of SED so we are sure to use the correct one. Signed-off-by: Yaakov Selkowitz Reviewed-by: Alan Coopersmith Reviewed-by: Julien Cristau --- cpprules.in | 2 -- hw/dmx/Makefile.am | 2 +- hw/dmx/config/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cpprules.in b/cpprules.in index 2e0856bee..301305e58 100644 --- a/cpprules.in +++ b/cpprules.in @@ -2,8 +2,6 @@ # Rules for generating files using the C pre-processor # (Replaces CppFileTarget from Imake) -SED = sed - SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index cdee5860a..fc9fde7b7 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -109,7 +109,7 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST = $(appman_PRE) diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index 9fa7113be..7de745f53 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -69,7 +69,7 @@ XORGRELSTRING = @PACKAGE_STRING@ MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(SED) $(MAN_SUBSTS) < $< > $@ EXTRA_DIST = \ $(appman_PRE) \