Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/gnome-doc-utils/autogen.sh,v
retrieving revision 1.9
diff -U5 -p -r1.9 autogen.sh
--- autogen.sh	16 Nov 2006 17:10:37 -0000	1.9
+++ autogen.sh	2 Dec 2006 08:47:40 -0000
@@ -23,6 +23,6 @@ which gnome-autogen.sh || {
 ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
 export ACLOCAL_FLAGS
 
 cp $srcdir/tools/gnome-doc-utils.m4 gnome-doc-utils.m4
 cp $srcdir/tools/gnome-doc-utils.make gnome-doc-utils.make
-REQUIRED_AUTOMAKE_VERSION=1.6 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+CONFIGURE_AC_FILES=$srcdir/configure.in REQUIRED_AUTOMAKE_VERSION=1.6 USE_GNOME2_MACROS=1 . gnome-autogen.sh
Index: doc/gnome-doc-make/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-doc-utils/doc/gnome-doc-make/Makefile.am,v
retrieving revision 1.6
diff -U5 -p -r1.6 Makefile.am
--- doc/gnome-doc-make/Makefile.am	8 Nov 2006 16:08:50 -0000	1.6
+++ doc/gnome-doc-make/Makefile.am	2 Dec 2006 08:47:40 -0000
@@ -1,11 +1,11 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/tools/gnome-doc-utils.make
 include $(top_srcdir)/bootstrap.make
 dist-hook: doc-dist-hook
 
 DOC_MODULE = gnome-doc-make
 DOC_INCLUDES = legal.xml make-ref.xml
 
-$(srcdir)/C/make-ref.xml: $(top_srcdir)/gnome-doc-utils.make
+$(srcdir)/C/make-ref.xml: $(top_srcdir)/tools/gnome-doc-utils.make
 	$(AWK) -f $(srcdir)/gnome-doc-make.awk $< > $@
 
 EXTRA_DIST = gnome-doc-make.awk
Index: doc/xslt/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-doc-utils/doc/xslt/Makefile.am,v
retrieving revision 1.12
diff -U5 -p -r1.12 Makefile.am
--- doc/xslt/Makefile.am	26 Nov 2006 19:24:32 -0000	1.12
+++ doc/xslt/Makefile.am	2 Dec 2006 08:47:40 -0000
@@ -1,17 +1,16 @@
-include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/tools/gnome-doc-utils.make
 include $(top_srcdir)/bootstrap.make
 dist-hook: doc-dist-hook
 
 xsldoc_dirs = 					\
 	$(top_srcdir)/xslt/gettext		\
 	$(top_srcdir)/xslt/docbook/common	\
 	$(top_srcdir)/xslt/docbook/html		\
 	$(top_srcdir)/xslt/docbook/omf
 xsldoc_xsls = $(filter-out %db2html-suppressed.xsl,				\
-	$(sort $(patsubst ./%, %, $(foreach dir,$(xsldoc_dirs),			\
-	$(wildcard $(dir)/*.xsl) $(wildcard $(srcdir)/$(dir)/*.xsl) ))) )
+	$(sort $(patsubst ./%, %, $(foreach dir,$(xsldoc_dirs), $(wildcard $(dir)/*.xsl) ))))
 xsldoc_base = $(sort $(foreach xsl,$(xsldoc_xsls), $(basename $(notdir $(xsl)))))
 xsldoc_docs = $(patsubst %, C/%.xml, $(xsldoc_base))
 
 all: $(xsldoc_docs)
 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc.xsl
