diff -up gtk-doc-1.9/xmldocs.make.docdir gtk-doc-1.9/xmldocs.make --- gtk-doc-1.9/xmldocs.make.docdir 2007-02-05 11:51:22.000000000 -0500 +++ gtk-doc-1.9/xmldocs.make 2007-11-18 11:27:57.000000000 -0500 @@ -34,9 +34,9 @@ # ********** Begin of section some packagers may need to modify ********** -# This variable (docdir) specifies where the documents should be installed. +# This variable (docsdir) specifies where the documents should be installed. # This default value should work for most packages. -docdir = $(datadir)/gnome/help/$(docname)/$(lang) +docsdir = $(datadir)/gnome/help/$(docname)/$(lang) # ********** You should not have to edit below this line ********** xml_files = $(entities) $(docname).xml @@ -63,15 +63,15 @@ app-dist-hook: fi install-data-local: omf - $(mkinstalldirs) $(DESTDIR)$(docdir) + $(mkinstalldirs) $(DESTDIR)$(docsdir) for file in $(xml_files); do \ - cp $(srcdir)/$$file $(DESTDIR)$(docdir); \ + cp $(srcdir)/$$file $(DESTDIR)$(docsdir); \ done if test "$(figdir)"; then \ - $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \ + $(mkinstalldirs) $(DESTDIR)$(docsdir)/$(figdir); \ for file in $(srcdir)/$(figdir)/*.png; do \ basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docsdir)/$(figdir)/$$basefile; \ done \ fi @@ -83,14 +83,14 @@ uninstall-local-doc: -if test "$(figdir)"; then \ for file in $(srcdir)/$(figdir)/*.png; do \ basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ + rm -f $(DESTDIR)$(docsdir)/$(figdir)/$$basefile; \ done; \ - rmdir $(DESTDIR)$(docdir)/$(figdir); \ + rmdir $(DESTDIR)$(docsdir)/$(figdir); \ fi -for file in $(xml_files); do \ - rm -f $(DESTDIR)$(docdir)/$$file; \ + rm -f $(DESTDIR)$(docsdir)/$$file; \ done - -rmdir $(DESTDIR)$(docdir) + -rmdir $(DESTDIR)$(docsdir) clean-local: clean-local-doc clean-local-omf