diff options
| author | Antoine Jacoutot <ajacoutot@gnome.org> | 2014-05-21 12:49:07 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2014-05-21 12:51:59 +0200 |
| commit | e4cf94c764fd1cdd9f3ba16b2dd0880390345425 (patch) | |
| tree | 93bcf315b67e747a53f7bce869b2ebe3bfd129f8 | |
| parent | b8342f2bf79d5591d4d976174242823ccf03a7af (diff) | |
Don't use non-portable sed -i shell command
https://bugzilla.gnome.org/show_bug.cgi?id=728506
| -rw-r--r-- | egg/Makefile.am | 6 | ||||
| -rw-r--r-- | gcr/Makefile.am | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/egg/Makefile.am b/egg/Makefile.am index 5b28e2a..bb6c1fa 100644 --- a/egg/Makefile.am +++ b/egg/Makefile.am @@ -139,8 +139,10 @@ ASN_SRCS = \ asn: for asn in $(ASN_SRCS); do \ - asn1Parser -o $(srcdir)/$$asn.h $(srcdir)/$$asn; \ - sed -i 's|#include.*|/* \0 */|' $(srcdir)/$$asn.h; \ + asn1Parser -o $(srcdir)/$$asn.h.tmp $$asn && \ + sed 's|#include.*|/* \0 */|' < $(srcdir)/$$asn.h.tmp > $(srcdir)/$$asn.h.tmp2 && \ + mv $(srcdir)/$$asn.h.tmp2 $(srcdir)/$$asn.h && \ + rm -f $(srcdir)/$$asn.h.tmp $(srcdir)/$$asn.h.tmp2 done EXTRA_DIST += \ diff --git a/gcr/Makefile.am b/gcr/Makefile.am index 2be0658..774cc12 100644 --- a/gcr/Makefile.am +++ b/gcr/Makefile.am @@ -159,9 +159,14 @@ DBUS_XML_DEFINITIONS = \ gcr/gcr-dbus-generated.c: $(DBUS_XML_DEFINITIONS) $(AM_V_GEN) $(GDBUS_CODEGEN) --interface-prefix org.gnome.keyring.internal. \ --generate-c-code gcr/gcr-dbus-generated --c-namespace GcrDBus $^ - $(AM_V_GEN) sed -i -e 's/gcr_dbus/_gcr_dbus/g' gcr/gcr-dbus-generated.[ch] + $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \ + gcr/gcr-dbus-generated.c > gcr/gcr-dbus-generated.c.tmp && \ + mv gcr/gcr-dbus-generated.c.tmp gcr/gcr-dbus-generated.c gcr/gcr-dbus-generated.h: gcr/gcr-dbus-generated.c + $(AM_V_GEN) sed -e 's/gcr_dbus/_gcr_dbus/g' \ + gcr/gcr-dbus-generated.h > gcr/gcr-dbus-generated.h.tmp && \ + mv gcr/gcr-dbus-generated.h.tmp gcr/gcr-dbus-generated.h pkgconfig_DATA += \ gcr-base-$(GCR_MAJOR).pc |