--- queryparser/Makefile.mk.orig	Tue Dec 23 20:55:31 2008
+++ queryparser/Makefile.mk	Thu Jan 15 16:30:10 2009
@@ -2,14 +2,9 @@
 # We need this so that generated sources can find non-generated headers in a
 # VPATH build from SVN.
 INCLUDES += -I$(top_srcdir)/queryparser
+endif
 
-if MAINTAINER_MODE
-# We need this because otherwise, if depcomp is being used (as it will be for a
-# build with gcc-2.95), depcomp will be unable to find queryparser_token.h.
-# This may be a bug in depcomp, but it certainly happens with automake-1.10.
 INCLUDES += -I$(top_builddir)/queryparser
-endif
-endif
 
 noinst_HEADERS +=\
 	queryparser/queryparser_internal.h\