From 902391e38795585e62d86f13148c416533cf5e34 Mon Sep 17 00:00:00 2001 From: "09:00:28 Tim Janik" Date: Fri, 11 Jan 2008 08:01:44 +0000 Subject: [PATCH] use mv/sed/rm on a temporary file instead of "sed -i" which is not 2008-01-11 09:00:28 Tim Janik * glib/Makefile.am (install-exec-hook): use mv/sed/rm on a temporary file instead of "sed -i" which is not portable enough. svn path=/trunk/; revision=6291 --- ChangeLog | 5 +++++ glib/Makefile.am | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92ea3bf7..16d1f39d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-01-11 09:00:28 Tim Janik + + * glib/Makefile.am (install-exec-hook): use mv/sed/rm on a temporary + file instead of "sed -i" which is not portable enough. + 2008-01-08 Alexander Larsson * tests/cxx-test.C: diff --git a/glib/Makefile.am b/glib/Makefile.am index 917ab930..ba66d532 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -326,12 +326,12 @@ CONFIGVARS = \ install-exec-hook: for sf in ${auto_config_binscripts} ; do \ - sed -i.bak \ + mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \ + && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \ -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 ; \ + || exit $$? ; \ + rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \ done endif -- 2.34.1