use "sed -i.bak <CMD> <FILE> && rm -f <FILE>.bak" syntax for

2007-12-21 18:02:30  Tim Janik  <timj@imendio.com>

        * glib/Makefile.am: use "sed -i.bak <CMD> <FILE> && rm -f <FILE>.bak"
        syntax for install-exec-hook, which seems to be the only "sed -i"
        variant that is portable across linux and MacOS.

svn path=/trunk/; revision=6187

diff --git a/ChangeLog b/ChangeLog
index b1b26c8cba12d6a4e2ac1f064d1f40c02e527002..45c551d982de90614c4ec220d688efc9b86fd8c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-21 18:02:30  Tim Janik  <timj@imendio.com>
+
+       * glib/Makefile.am: use "sed -i.bak <CMD> <FILE> && rm -f <FILE>.bak"
+       syntax for install-exec-hook, which seems to be the only "sed -i"
+       variant that is portable across linux and MacOS.
+
 2007-12-21  Matthias Clasen  <mclasne@redhat.com>
 
        * glib/gtestutils.h: Bring up to GLib coding standards: remove

diff --git a/glib/Makefile.am b/glib/Makefile.am
index ef38e8553c3700a4061d3a5532ecbf8395a1892d..917ab930decbb64a2afd78eddb26ebf7732aaf69 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -326,9 +326,12 @@ CONFIGVARS = \
 
 install-exec-hook:
        for sf in ${auto_config_binscripts} ; do \
-         sed -i "$(DESTDIR)$(bindir)/$$sf" \
-            -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@|  ${CONFIGVARS}|' \
-            -e '1,1s|#!/usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' || exit $$? ; \
+         sed -i.bak \
+           -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@|  ${CONFIGVARS}|' \
+           -e '1,1s|#!/usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
+           "$(DESTDIR)$(bindir)/$$sf" \
+         || exit $$? \
+         && rm -f "$(DESTDIR)$(bindir)/$$sf".bak ; \
        done
 
 endif