From owner-p4-projects@FreeBSD.ORG  Fri Aug  7 12:52:08 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F89C1065677; Fri,  7 Aug 2009 12:52:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3BA7A1065672
	for <perforce@freebsd.org>; Fri,  7 Aug 2009 12:52:08 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A32C8FC15
	for <perforce@freebsd.org>; Fri,  7 Aug 2009 12:52:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n77Cq82E028698
	for <perforce@freebsd.org>; Fri, 7 Aug 2009 12:52:08 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n77Cq8xq028696
	for perforce@freebsd.org; Fri, 7 Aug 2009 12:52:08 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 7 Aug 2009 12:52:08 GMT
Message-Id: <200908071252.n77Cq8xq028696@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167089 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Aug 2009 12:52:09 -0000

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

Change 167089 by stas@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; \