[nautilus-python/nautilus-3.0] Fix docs issues when creating distribution tarball

[Adam Plumb <adamplumb src gnome org>]

commit d45d9085d69bde923e63f739fa5b39605933fee7
Author: Adam Plumb <adamplumb gmail com>
Date:   Mon Oct 17 13:48:35 2011 -0400

    Fix docs issues when creating distribution tarball

 configure.in     |    6 ------
 docs/Makefile.am |   36 ++++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2538ada..9886cdc 100644
--- a/configure.in
+++ b/configure.in
@@ -62,12 +62,6 @@ PKG_CHECK_MODULES(NAUTILUS_PYTHON, [$PYGOBJECT_VERSION >= $PYGOBJECT_REQUIRED
 PYGOBJECT_DATADIR=`$PKG_CONFIG --variable=datadir $PYGOBJECT_VERSION`
 AC_SUBST(PYGOBJECT_DATADIR)
 
-PYGOBJECT_PYGDOCS="`$PKG_CONFIG --variable=pygdocs $PYGOBJECT_VERSION`"
-AC_SUBST(PYGOBJECT_PYGDOCS)
-
-PYGOBJECT_FIXXREF="$PYTHON `$PKG_CONFIG --variable=fixxref $PYGOBJECT_VERSION`"
-AC_SUBST(PYGOBJECT_FIXXREF)
-
 NAUTILUS_LIBDIR=`$PKG_CONFIG --variable=libdir libnautilus-extension`
 AC_SUBST(NAUTILUS_LIBDIR)
 AC_DEFINE_UNQUOTED(NAUTILUS_LIBDIR, "$NAUTILUS_LIBDIR", [Nautilus libdir])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 42c8d8b..015b552 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -3,9 +3,10 @@ BUILDDIR = $(top_builddir)/docs
 REF_VERSION = $(VERSION)
 FULL_VERSION = $(VERSION)
 
-HTML_STYLE = $(PYGOBJECT_PYGDOCS)/ref-html-style.xsl
+FIXXREF = $(srcdir)/xsl/fixxref.py
+HTML_STYLE = $(srcdir)/xsl/ref-html-style.xsl
 
-XMLFILES = 							\
+XML_FILES = 							\
 	reference/nautilus-python-ref.xml			\
 	reference/nautilus-python-overview.xml			\
 	reference/nautilus-python-overview-example.xml			\
@@ -26,7 +27,7 @@ XMLFILES = 							\
 	reference/nautilus-python-operation-result.xml
 
 HTMLdir = $(datadir)/gtk-doc/html/nautilus-python
-HTMLFILES =						\
+HTML_FILES =						\
 	html/index.html					\
 	html/index.sgml					\
 	html/nautilus-python-overview.html \
@@ -49,38 +50,53 @@ HTMLFILES =						\
 	html/nautilus-python.devhelp
 HTML_DATA = $(HTMLFILES)
 
-CSS_FILES = $(PYGOBJECT_PYGDOCS)/style.css
+XSL_FILES =             \
+	xsl/common.xsl      \
+	xsl/devhelp.xsl     \
+	xsl/html.xsl        \
+	xsl/pdf-style.xsl   \
+	xsl/pdf.xsl         \
+	xsl/style.css
+XSL_DATA = $(XSL_FILES) $(FIXXREF)
+XSLdir = $(BUILDDIR)/xsl
+
+CSS_FILES = xsl/style.css
 CSSdir = $(HTMLdir)
 CSS_DATA = $(CSS_FILES)
 
 BUILT_SOURCES = 		\
 	reference/builddate.xml	\
-	$(HTMLFILES)
+	$(HTML_FILES)
 
 CLEANFILES = 			\
 	nautilus-python-ref.*	\
 	reference/builddate.xml	\
-	$(HTMLFILES)
+	$(HTML_FILES)
 
 EXTRA_DIST = 		\
-	$(XMLFILES)
+	$(XML_FILES)     \
+	$(XSL_FILES)    \
+	$(FIXXREF)      \
+	$(HTML_STYLE)
 
 REFERENCE_DEPS = 	\
 	reference 	\
-	$(XMLFILES)
+	$(XML_FILES)    \
+	$(XSL_FILES)    \
+	$(FIXXREF)
 
 if ENABLE_GTK_DOC
 
 reference/builddate.xml: $(REFERENCE_DEPS)
 	$(PYTHON) -c 'import datetime; print datetime.date.today()' > $@
 
-$(HTMLFILES): $(REFERENCE_DEPS)
+$(HTML_FILES): $(REFERENCE_DEPS)
 	xsltproc --nonet --xinclude -o $(BUILDDIR)/html/ \
 		 --path $(BUILDDIR)/reference:$(srcdir)/reference \
 		 --stringparam gtkdoc.bookname "nautilus-python" \
 		 --stringparam gtkdoc.version ${REF_VERSION} \
 		 $(HTML_STYLE) $(srcdir)/reference/nautilus-python-ref.xml
-	$(PYGOBJECT_FIXXREF) -i $(PYGOBJECT_PYGDOCS) $(BUILDDIR)/html 
+	$(FIXXREF) -i xsl $(BUILDDIR)/html 
 	touch $@
 
 endif