Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision da5ac2ef4386a3403a0fd7fa1e80a09952f63688)
+++ src/Makefile.am	(revision 4bc4b4cec0733ff958ac176d48cfdd174ada1a31)
@@ -72,7 +72,7 @@
 
 cfa_cpplib_PROGRAMS += $(DEMANGLER)
-EXTRA_PROGRAMS = demangler
-demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
-demangler_LDADD = libdemangle.a -ldl			# yywrap
+EXTRA_PROGRAMS = ../driver/demangler
+___driver_demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
+___driver_demangler_LDADD = libdemangle.a -ldl			# yywrap
 noinst_LIBRARIES = $(LIBDEMANGLE)
 EXTRA_LIBRARIES = libdemangle.a