[Xfce4-commits] <thunar:master> Use macro to search for sed (bug #8686).

[Nick Schermer]

Updating branch refs/heads/master
         to 7c194fa77424d12a0e8d0a198ab46b5ea9396e04 (commit)
       from a176cc84685e33dc1358b0a02181428c246ad136 (commit)

commit 7c194fa77424d12a0e8d0a198ab46b5ea9396e04
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Apr 13 18:05:06 2012 +0200

    Use macro to search for sed (bug #8686).

 Makefile.am        |    6 +++---
 configure.in.in    |    1 +
 thunar/Makefile.am |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 12a85a1..88fc939 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ thunar_scripts_SCRIPTS =						\
 ThunarBulkRename: ThunarBulkRename.in Makefile
 	$(AM_V_GEN) (							\
 		rm -f ThunarBulkRename.gen ThunarBulkRename		\
-		&& sed -e "s,\@bindir\@,$(bindir),g" 			\
+		&& $(SED) -e "s,\@bindir\@,$(bindir),g" 			\
 			< $(srcdir)/ThunarBulkRename.in			\
 			> ThunarBulkRename.gen				\
 		&& mv ThunarBulkRename.gen ThunarBulkRename 		\
@@ -63,7 +63,7 @@ desktop_in_in_files = 							\
 	Thunar-folder-handler.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 %.desktop.in: %.desktop.in.in
-	$(AM_V_GEN) sed -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@
+	$(AM_V_GEN) $(SED) -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
@@ -72,7 +72,7 @@ servicedir = $(datadir)/dbus-1/services
 service_in_files = org.xfce.FileManager.service.in org.xfce.Thunar.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 %.service: %.service.in
-	$(AM_V_GEN) sed -e "s,\@bindir\@,$(bindir),g" < $< > $@
+	$(AM_V_GEN) $(SED) -e "s,\@bindir\@,$(bindir),g" < $< > $@
 endif
 
 EXTRA_DIST =								\
diff --git a/configure.in.in b/configure.in.in
index 5f0a54d..c233e9b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -73,6 +73,7 @@ AM_PROG_CC_C_O()
 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/thunar/Makefile.am b/thunar/Makefile.am
index 51f1810..45175ca 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -345,7 +345,7 @@ thunar-thumbnailer-proxy.h: $(srcdir)/thunar-thumbnailer-dbus.xml Makefile
 	$(AM_V_GEN) ( \
 		dbus-binding-tool --mode=glib-client \
 			$(srcdir)/thunar-thumbnailer-dbus.xml > thunar-thumbnailer-proxy.h \
-		&& sed -i -e 's/org_freedesktop_thumbnails_Thumbnailer1/thunar_thumbnailer_proxy/g' \
+		&& $(SED) -i -e 's/org_freedesktop_thumbnails_Thumbnailer1/thunar_thumbnailer_proxy/g' \
 			thunar-thumbnailer-proxy.h \
 	)
 
@@ -353,7 +353,7 @@ thunar-thumbnail-cache-proxy.h: $(srcdir)/thunar-thumbnail-cache-dbus.xml Makefi
 	$(AM_V_GEN) ( \
 		dbus-binding-tool --mode=glib-client \
 			$(srcdir)/thunar-thumbnail-cache-dbus.xml > thunar-thumbnail-cache-proxy.h \
-		&& sed -i -e 's/org_freedesktop_thumbnails_Cache1/thunar_thumbnail_cache_proxy/g' \
+		&& $(SED) -i -e 's/org_freedesktop_thumbnails_Cache1/thunar_thumbnail_cache_proxy/g' \
 			thunar-thumbnail-cache-proxy.h \
 	)
 endif