Commit 7c194fa7 authored by Nick Schermer's avatar Nick Schermer

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

parent a176cc84
......@@ -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 = \
......
......@@ -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 ***
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment