From 0a76f7d6b4e305d21ca0d41f27993b6e35a3d6e8 Mon Sep 17 00:00:00 2001
From: "18:02:30  Tim Janik" <timj@imendio.com>
Date: Fri, 21 Dec 2007 17:02:29 +0000
Subject: [PATCH] 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
---
 ChangeLog        | 6 ++++++
 glib/Makefile.am | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1b26c8..45c551d 100644
--- 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 ef38e85..917ab93 100644
--- 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
-- 
2.7.4