Config/build/install vg_annotate and vg_cachegen correctly.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@169 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index fcbfae9..7086d48 100644
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -80,10 +80,6 @@
 
 MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
 
-vg_annotate:
-
-vg_cachegen:
-
 vg_memory.o: vg_memory.c $(MANUAL_DEPS)
 	$(COMPILE) -O2 @PREFERRED_STACK_BOUNDARY@ -c $<
 
diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
index b3b091c..b09cc34 100644
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -217,7 +217,7 @@
 
             # --version
             if ($arg =~ /^-v$|^--version$/) {
-                die("vg_annotate$version\n");
+                die("vg_annotate-$version\n");
 
             # --show=A,B,C
             } elsif ($arg =~ /^--show=(.*)$/) {