From owner-p4-projects@FreeBSD.ORG Sat Aug 8 16:13:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57DDF1065674; Sat, 8 Aug 2009 16:13:02 +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 19E15106566C for ; Sat, 8 Aug 2009 16:13:02 +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 E388E8FC15 for ; Sat, 8 Aug 2009 16:13:01 +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 n78GD1c4040183 for ; Sat, 8 Aug 2009 16:13:01 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n78GD1vM040181 for perforce@freebsd.org; Sat, 8 Aug 2009 16:13:01 GMT (envelope-from stas@freebsd.org) Date: Sat, 8 Aug 2009 16:13:01 GMT Message-Id: <200908081613.n78GD1vM040181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Cc: Subject: PERFORCE change 167107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2009 16:13:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=167107 Change 167107 by stas@stas_orion on 2009/08/08 16:12:11 - Fix the bug in Makefile I introduced yesterday that lead to programs being installed under the wrong name. Affected files ... .. //depot/projects/valgrind/Makefile.install.am#5 edit .. //depot/projects/valgrind/Makefile.tool-inplace.am#5 edit Differences ... ==== //depot/projects/valgrind/Makefile.install.am#5 (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 -e 's/-([^-]*-[^-\.]*)(.\.*)?$$/\2/'`; \ - plat=`echo $$f | $(SED) -E -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 ; \ @@ -34,8 +34,8 @@ if [ -n "$(noinst_LIBRARIES)" ] ; then \ for f in $(noinst_LIBRARIES) expr_wont_match_me; do \ if expr match $$f libcoregrind_ > /dev/null ; then \ - pU=`echo $$f | sed -e 's/libcoregrind_//g' -e 's/\.a//g'` ; \ - pD=`echo $$pU | sed -e 's/_/-/g'` ; \ + pU=`echo $$f | ${SED} -e 's/libcoregrind_//g' -e 's/\.a//g'` ; \ + pD=`echo $$pU | ${SED} -e 's/_/-/g'` ; \ $(INSTALL_DATA) $$f $(DESTDIR)$(valdir)/$$pD/libcoregrind.a ; \ $(INSTALL_DATA) @VEX_DIR@/libvex_$$pU.a \ $(DESTDIR)$(valdir)/$$pD/libvex.a ; \ ==== //depot/projects/valgrind/Makefile.tool-inplace.am#5 (text+ko) ==== @@ -5,8 +5,8 @@ all-local: if [ -n "$(noinst_PROGRAMS)" ] ; then \ for f in $(noinst_PROGRAMS); do \ - name=`echo $$f | $(SED) -E -e 's/-([^-]*-[^-\.]*)(.\.*)?$$/\2/'`; \ - plat=`echo $$f | $(SED) -E -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; \