[Xfce4-commits] <xfce4-panel:master> Check for sed using a macro.

[Nick Schermer]

Updating branch refs/heads/master
         to 2025534504277c2d79e8278f877fa8d6140c5b70 (commit)
       from 83fecb1e4296fdc798d9825c58464cf60058c925 (commit)

commit 2025534504277c2d79e8278f877fa8d6140c5b70
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Apr 13 18:07:57 2012 +0200

    Check for sed using a macro.

 configure.ac.in                      |    1 +
 plugins/applicationsmenu/Makefile.am |    2 +-
 plugins/directorymenu/Makefile.am    |    2 +-
 plugins/windowmenu/Makefile.am       |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 723242b..71a42c4 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -69,6 +69,7 @@ AC_PROG_LD()
 AC_PROG_INSTALL()
 AC_PROG_INTLTOOL()
 AC_CHECK_PROGS([PERL], [perl5 perl])
+m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_CHECK_PROG(SED, sed, sed)])
 
 dnl **************************
 dnl *** Initialize libtool ***
diff --git a/plugins/applicationsmenu/Makefile.am b/plugins/applicationsmenu/Makefile.am
index 59462fe..0689247 100644
--- a/plugins/applicationsmenu/Makefile.am
+++ b/plugins/applicationsmenu/Makefile.am
@@ -54,7 +54,7 @@ bin_SCRIPTS = \
 	xfce4-popup-applicationsmenu
 
 xfce4-popup-applicationsmenu: xfce4-popup-applicationsmenu.sh Makefile
-	$(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" \
+	$(AM_V_GEN) $(SED) -e "s,\@bindir\@,$(bindir),g" \
 	-e "s,\@localedir\@,$(localedir),g" $< >$@
 
 #
diff --git a/plugins/directorymenu/Makefile.am b/plugins/directorymenu/Makefile.am
index 8847f28..0aa46b8 100644
--- a/plugins/directorymenu/Makefile.am
+++ b/plugins/directorymenu/Makefile.am
@@ -56,7 +56,7 @@ bin_SCRIPTS = \
 	xfce4-popup-directorymenu
 
 xfce4-popup-directorymenu: xfce4-popup-directorymenu.sh Makefile
-	$(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" \
+	$(AM_V_GEN) $(SED) -e "s,\@bindir\@,$(bindir),g" \
 	-e "s,\@localedir\@,$(localedir),g" $< >$@
 
 #
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 56d68cc..88f7bf2 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -55,7 +55,7 @@ bin_SCRIPTS = \
 	xfce4-popup-windowmenu
 
 xfce4-popup-windowmenu: xfce4-popup-windowmenu.sh Makefile
-	$(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" \
+	$(AM_V_GEN) $(SED) -e "s,\@bindir\@,$(bindir),g" \
 	-e "s,\@localedir\@,$(localedir),g" $< >$@
 
 #