PERFORCE change 167089 for review

[Stanislav Sedov]

http://perforce.freebsd.org/chv.cgi?CH=167089

Change 167089 by stas at stas_deglitch on 2009/08/07 12:51:52

	- Fix a couple of other SED invocations.

Affected files ...

.. //depot/projects/valgrind/Makefile.install.am#4 edit
.. //depot/projects/valgrind/Makefile.tool-inplace.am#4 edit

Differences ...

==== //depot/projects/valgrind/Makefile.install.am#4 (text+ko) ====

@@ -25,8 +25,8 @@
 install-exec-local:
 	if [ -n "$(noinst_PROGRAMS)" ] ; then \
 	  for f in $(noinst_PROGRAMS); do \
-	    name=`echo $$f | $(SED) -e 's/-\([^-]*-[^-.]*\)\(\..*\)\?$$/\2/'`; \
-	    plat=`echo $$f | $(SED) -e 's/^.*-\([^-]*-[^-.]*\)\(\..*\)\?$$/\1/'`; \
+	    name=`echo $$f | $(SED) -E -e 's/-([^-]*-[^-\.]*)(.\.*)?$$/\2/'`; \
+	    plat=`echo $$f | $(SED) -E -e 's/^.*-([^-]*-[^-\.]*)(.\.*)?$$/\1/'`; \
 	    $(mkinstalldirs) $(DESTDIR)$(valdir)/$$plat; \
 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(valdir)/$$plat/$$name; \
 	  done ; \

==== //depot/projects/valgrind/Makefile.tool-inplace.am#4 (text+ko) ====

@@ -5,8 +5,8 @@
 all-local:
 	if [ -n "$(noinst_PROGRAMS)" ] ; then \
 	  for f in $(noinst_PROGRAMS); do \
-	    name=`echo $$f | $(SED) -e 's/-\([^-]*-[^-.]*\)\(\..*\)\?$$/\2/'`; \
-	    plat=`echo $$f | $(SED) -e 's/^.*-\([^-]*-[^-.]*\)\(\..*\)\?$$/\1/'`; \
+	    name=`echo $$f | $(SED) -E -e 's/-([^-]*-[^-\.]*)(.\.*)?$$/\2/'`; \
+	    plat=`echo $$f | $(SED) -E -e 's/^.*-([^-]*-[^-\.]*)(.\.*)?$$/\1/'`; \
 	    mkdir -p $(inplacedir)/$$plat; \
 	    rm -f $(inplacedir)/$$plat/$$name; \
 	    ln -f -s ../../$(subdir)/$$f $(inplacedir)/$$plat/$$name; \