[PATCH 4/5] Respect value of SED from configure

Yaakov (Cygwin/X) yselkowitz at users.sourceforge.net
Wed Mar 17 13:11:09 PDT 2010


From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>

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 at users.sourceforge.net>
---
 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 2e0856b..301305e 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 cdee586..fc9fde7 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 9fa7113..7de745f 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) \
-- 
1.6.6.1



More information about the xorg-devel mailing list