summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2010-03-17 13:33:39 -0500
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2010-03-22 00:45:54 -0500
commit9be4157391edf0c5fc4ee36adfb1eb1c3bdb8e3b (patch)
tree58316575ab60f49f2ebcaf029f60357a3f1f9330
parent5e00f464c546debf9164f24c6d648623f7ee5946 (diff)
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 <yselkowitz@users.sourceforge.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
-rw-r--r--cpprules.in2
-rw-r--r--hw/dmx/Makefile.am2
-rw-r--r--hw/dmx/config/Makefile.am2
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) \