diff --git a/ChangeLog b/ChangeLog index b1b26c8cb..45c551d98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-21 18:02:30 Tim Janik + + * glib/Makefile.am: use "sed -i.bak && rm -f .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 * glib/gtestutils.h: Bring up to GLib coding standards: remove diff --git a/glib/Makefile.am b/glib/Makefile.am index ef38e8553..917ab930d 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