Author: sewardj
Date: 2007-11-17 18:35:54 +0000 (Sat, 17 Nov 2007)
New Revision: 7174
Log:
Makefile.tool-inplace.am: correctly handle tool names with dashes in,
using same changes to magic sed scripts as were recently applied to
Makefile.install.am.
Modified:
trunk/Makefile.install.am
trunk/Makefile.tool-inplace.am
Modified: trunk/Makefile.install.am
===================================================================
--- trunk/Makefile.install.am 2007-11-17 09:43:25 UTC (rev 7173)
+++ trunk/Makefile.install.am 2007-11-17 18:35:54 UTC (rev 7174)
@@ -9,6 +9,8 @@
# and not in
# $prefix/lib/valgrind/omega-x86-linux/exp
# or similarly mutant place.
+#
+# Note there is identical sed magic in Makefile.tool-inplace.am.
# What the second for loop does: it copies libcoregrind.a and libvex.a
# into the correct (target-specific) lib dirs at install time.
Modified: trunk/Makefile.tool-inplace.am
===================================================================
--- trunk/Makefile.tool-inplace.am 2007-11-17 09:43:25 UTC (rev 7173)
+++ trunk/Makefile.tool-inplace.am 2007-11-17 18:35:54 UTC (rev 7174)
@@ -1,8 +1,14 @@
+
+# For a description of what these magic sed commands do, see comments
+# in Makefile.install.am (which has identical magic)
+
all-local:
- for f in $(noinst_PROGRAMS); do \
- p=`echo $$f | sed -e 's/^[^-]*-//' -e 's/\..*$$//'`; \
- n=`echo $$f | sed -e 's/-[^-]\{1,\}-[^-.]\{1,\}//'`; \
- mkdir -p $(inplacedir)/$$p; \
- rm -f $(inplacedir)/$$p/$$n; \
- ln -f -s ../../$(subdir)/$$f $(inplacedir)/$$p/$$n; \
- done
+ 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/'`; \
+ mkdir -p $(inplacedir)/$$plat; \
+ rm -f $(inplacedir)/$$plat/$$name; \
+ ln -f -s ../../$(subdir)/$$f $(inplacedir)/$$plat/$$name; \
+ done ; \
+ fi
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
