4 files changed, 6 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index f5dc718088..f7cb506dd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ m4/ltversion.m4
 m4/lt~obsolete.m4
 
 m4/gtk-doc.m4
+docs/gtk-doc.make
diff --git a/autogen.sh b/autogen.sh
index 7cb335c541..26f4160c52 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,7 @@
 if type -p gtkdocize > /dev/null; then
 	gtkdocize --docdir docs
 else
+	echo 'EXTRA_DIST =' > docs/gtk-doc.make
 	echo 'AC_DEFUN([GTK_DOC_CHECK], [AM_CONDITIONAL([ENABLE_GTK_DOC], [FALSE])])' > m4/gtk-doc.m4
 fi
 
diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am
index e0039e7606..57334b6ddc 100644
--- a/docs/gudev/Makefile.am
+++ b/docs/gudev/Makefile.am
@@ -94,11 +94,8 @@ GTKDOC_LIBS = \
 	$(GLIB_LIBS) \
 	$(top_builddir)/libgudev-1.0.la
 
-if ENABLE_GTK_DOC
-EXTRA_DIST=
-
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/docs/gtk-doc.make
+include $(top_srcdir)/docs/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
@@ -110,6 +107,7 @@ EXTRA_DIST += version.xml.in
 #DISTCLEANFILES +=
 
 # Comment this out if you want your docs-status tested during 'make check'
+if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(top_srcdir)
 TESTS = $(GTKDOC_CHECK)
 endif
diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am
index 7899bd1145..c6d7b8ca25 100644
--- a/docs/libudev/Makefile.am
+++ b/docs/libudev/Makefile.am
@@ -88,11 +88,8 @@ override LDFLAGS=
 GTKDOC_CFLAGS=
 GTKDOC_LIBS=
 
-if ENABLE_GTK_DOC
-EXTRA_DIST=
-
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
--include $(top_srcdir)/docs/gtk-doc.make
+include $(top_srcdir)/docs/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
@@ -104,6 +101,7 @@ EXTRA_DIST += version.xml.in
 #DISTCLEANFILES +=
 
 # Comment this out if you want your docs-status tested during 'make check'
+if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(top_srcdir)
 TESTS = $(GTKDOC_CHECK)
 endif