PERFORCE change 167107 for review

[Stanislav Sedov]

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

Change 167107 by stas at 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; \