--- Makefile.in.orig	2011-08-10 06:54:57 UTC
+++ Makefile.in
@@ -47,7 +47,8 @@
 @VPATH_BUILD_TRUE@am__append_1 = -I$(top_builddir)/include \
 @VPATH_BUILD_TRUE@	-I$(top_srcdir)/languages -Ilanguages \
 @VPATH_BUILD_TRUE@	-I$(top_srcdir)/queryparser
-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+noinst_bin_PROGRAMS = \
 	examples/copydatabase$(EXEEXT) examples/delve$(EXEEXT) \
 	examples/quest$(EXEEXT) examples/simpleexpand$(EXEEXT) \
 	examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT) \
@@ -713,7 +714,7 @@
 @BUILD_BACKEND_CHERT_TRUE@@BUILD_BACKEND_FLINT_TRUE@am__EXEEXT_2 = bin/xapian-chert-update$(EXEEXT)
 @BUILD_BACKEND_REMOTE_TRUE@am__EXEEXT_3 = bin/xapian-progsrv$(EXEEXT) \
 @BUILD_BACKEND_REMOTE_TRUE@	bin/xapian-tcpsrv$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_bin_PROGRAMS)
 am__bin_xapian_check_SOURCES_DIST = bin/xapian-check.cc \
 	bin/xapian-check-brass.cc bin/xapian-check-brass.h \
 	bin/xapian-check-chert.cc bin/xapian-check-chert.h \
@@ -1323,10 +1324,7 @@
 	weight/tradweight.cc weight/weight.cc weight/weightinternal.cc
 @MAINTAINER_NO_DOCS_FALSE@dist_man_MANS = xapian-config.1 \
 @MAINTAINER_NO_DOCS_FALSE@	$(am__append_3) $(am__append_5) \
-@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7) \
-@MAINTAINER_NO_DOCS_FALSE@	examples/copydatabase.1 \
-@MAINTAINER_NO_DOCS_FALSE@	examples/delve.1 examples/quest.1 \
-@MAINTAINER_NO_DOCS_FALSE@	examples/xapian-metadata.1
+@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7)
 bin_xapian_check_CPPFLAGS = \
 	-I$(top_srcdir)/backends/brass\
 	-I$(top_srcdir)/backends/chert\