../configure + make dist works from CVS

diff --git a/doc/Makefile.am b/doc/Makefile.am
index dd267cc..e3aefe0 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.68 2006-05-24 12:33:21 adam Exp $
+## $Id: Makefile.am,v 1.69 2006-05-24 14:44:01 adam Exp $
 
 docdir=$(datadir)/doc/@PACKAGE@
 
@@ -71,7 +71,7 @@ yaz-log.7: yaz-log-man.xml
        xsltproc common/man.xsl $(srcdir)/yaz-log-man.xml
 
 $(HTMLFILES): $(XMLFILES)
-       xsltproc common/html.xsl $(srcdir)/yaz.xml
+       xsltproc common/html.xsl yaz.xml
 
 yaz.pdf: $(XMLFILES)
        if test ! -f common/id.png ; then cp $(srcdir)/common/id.png common; fi
@@ -89,7 +89,7 @@ apilayer.png:
        xbmtopbm <apilayer.xbm|pnmtopng >apilayer.png
 
 dist-hook:
-       for f in $(srcdir)/*.html; do \
+       for f in *.html; do \
                found=0; \
                b=`basename $$f`; \
                for h in $(HTMLFILES); do \

diff --git a/doc/yaz.xml.in b/doc/yaz.xml.in
index 8a77fd5..2216917 100644 (file)
--- a/doc/yaz.xml.in
+++ b/doc/yaz.xml.in
@@ -1,13 +1,13 @@
 <?xml version="1.0" standalone="no"?>
-<!-- $Id: yaz.xml.in,v 1.23 2006-05-24 14:19:32 adam Exp $ -->
+<!-- $Id: yaz.xml.in,v 1.24 2006-05-24 14:44:01 adam Exp $ -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
     "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
 [
      <!ENTITY version "@VERSION@">
 
-     <!ENTITY % entities  SYSTEM "entities.ent">
+     <!ENTITY % entities  SYSTEM "@srcdir@/entities.ent">
      %entities;
-     <!ENTITY % common  SYSTEM "common/common.ent">
+     <!ENTITY % common  SYSTEM "@srcdir@/common/common.ent">
      %common;
 ]>
 <book id="yaz">