Updating branch refs/heads/master
to 7e81439d6dbfaa638e3c392150adef06b47e42e8 (commit)
from eeee8522907eb2a468e0e5e0ae0cf9a877a24d56 (commit)
commit 7e81439d6dbfaa638e3c392150adef06b47e42e8
Author: Nick Schermer <[email protected]>
Date: Fri Apr 13 18:00:19 2012 +0200
Check for sed with a macro (bug #8687).
configure.ac.in | 1 +
settings/Makefile.am | 2 +-
src/Makefile.am | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 0ddd399..9051c07 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -48,6 +48,7 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
+m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_CHECK_PROG(SED, sed, sed)])
dnl prepare libtool
LT_PREREQ([2.2.6])
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 7e36d30..09cff59 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -48,7 +48,7 @@ BUILT_SOURCES = \
SUFFIXES: .ui
%-ui.h: $(srcdir)/%-ui.glade Makefile
- $(AM_V_GEN) exo-csource --static --name=`basename $< .glade | sed -e
's/-/_/g'` $< >$@
+ $(AM_V_GEN) exo-csource --static --name=`basename $< .glade | $(SED) -e
's/-/_/g'` $< >$@
endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 3adb3d2..adeac0b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -189,7 +189,7 @@ xfdesktop-file-manager-proxy.h:
$(srcdir)/xfdesktop-file-manager-dbus.xml Makefi
$(AM_V_GEN) ( \
dbus-binding-tool --mode=glib-client \
$(srcdir)/xfdesktop-file-manager-dbus.xml >
xfdesktop-file-manager-proxy.h \
- && sed -i -e
's/org_xfce_FileManager/xfdesktop_file_manager_proxy/g' \
+ && $(SED) -i -e
's/org_xfce_FileManager/xfdesktop_file_manager_proxy/g' \
xfdesktop-file-manager-proxy.h \
)
@@ -197,7 +197,7 @@ xfdesktop-thunar-proxy.h:
$(srcdir)/xfdesktop-thunar-dbus.xml Makefile
$(AM_V_GEN) ( \
dbus-binding-tool --mode=glib-client \
$(srcdir)/xfdesktop-thunar-dbus.xml >
xfdesktop-thunar-proxy.h \
- && sed -i -e 's/org_xfce_Thunar/xfdesktop_thunar_proxy/g' \
+ && $(SED) -i -e 's/org_xfce_Thunar/xfdesktop_thunar_proxy/g' \
xfdesktop-thunar-proxy.h \
)
@@ -205,7 +205,7 @@ xfdesktop-trash-proxy.h: $(srcdir)/xfdesktop-trash-dbus.xml
Makefile
$(AM_V_GEN) ( \
dbus-binding-tool --mode=glib-client \
$(srcdir)/xfdesktop-trash-dbus.xml >
xfdesktop-trash-proxy.h \
- && sed -i -e 's/org_xfce_Trash/xfdesktop_trash_proxy/g' \
+ && $(SED) -i -e 's/org_xfce_Trash/xfdesktop_trash_proxy/g' \
xfdesktop-trash-proxy.h \
)
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
