glib r6291 - in trunk: . glib

[timj svn gnome org]

Author: timj
Date: Fri Jan 11 08:01:44 2008
New Revision: 6291
URL: http://svn.gnome.org/viewvc/glib?rev=6291&view=rev

Log:
2008-01-11 09:00:28  Tim Janik  <timj imendio com>                                                                                                            
                                                                                                                                                              
        * glib/Makefile.am (install-exec-hook): use mv/sed/rm on a temporary                                                                                  
        file instead of "sed -i" which is not portable enough.                                                                                                
                                                                                                                                                              



Modified:
   trunk/ChangeLog
   trunk/glib/Makefile.am

Modified: trunk/glib/Makefile.am
==============================================================================
--- trunk/glib/Makefile.am	(original)
+++ trunk/glib/Makefile.am	Fri Jan 11 08:01:44 2008
@@ -326,12 +326,12 @@
 
 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