Fix "make distcheck".
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4633 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c15e451..fee2b2a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -24,12 +24,12 @@
##-------------------------------------------------------------------
## Below here is more ordinary make stuff...
##-------------------------------------------------------------------
-docdir = ./
-xmldir = $(docdir)xml
-imgdir = $(docdir)images
-libdir = $(docdir)lib
-htmldir = $(docdir)html
-printdir = $(docdir)print
+myxmldir = $(top_srcdir)/docs/xml
+myimgdir = $(top_srcdir)/docs/images
+mylibdir = $(top_srcdir)/docs/lib
+
+myhtmldir = $(top_builddir)/docs/html
+myprintdir = $(top_builddir)/docs/print
XML_CATALOG_FILES = /etc/xml/catalog
@@ -47,40 +47,40 @@
XSLTPROC_FLAGS = --nonet --xinclude
# stylesheets
-XSL_HTML_CHUNK_STYLE = $(libdir)/vg-html-chunk.xsl
-XSL_HTML_SINGLE_STYLE = $(libdir)/vg-html-single.xsl
-XSL_FO_STYLE = $(libdir)/vg-fo.xsl
+XSL_HTML_CHUNK_STYLE = $(mylibdir)/vg-html-chunk.xsl
+XSL_HTML_SINGLE_STYLE = $(mylibdir)/vg-html-single.xsl
+XSL_FO_STYLE = $(mylibdir)/vg-fo.xsl
all-docs: html-docs print-docs
valid:
- $(XMLLINT) $(XMLLINT_FLAGS) $(xmldir)/index.xml
+ $(XMLLINT) $(XMLLINT_FLAGS) $(myxmldir)/index.xml
# chunked html
html-docs:
@echo "Generating html files..."
export XML_CATALOG_FILES=$(XML_CATALOG_FILES) && \
- mkdir -p $(htmldir) && \
- /bin/rm -fr $(htmldir)/ && \
- mkdir -p $(htmldir)/ && \
- mkdir -p $(htmldir)/images && \
- cp $(libdir)/vg_basic.css $(htmldir)/ && \
- cp $(imgdir)/*.png $(htmldir)/images && \
- $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(htmldir)/ $(XSL_HTML_CHUNK_STYLE) $(xmldir)/index.xml
+ mkdir -p $(myhtmldir) && \
+ /bin/rm -fr $(myhtmldir)/ && \
+ mkdir -p $(myhtmldir)/ && \
+ mkdir -p $(myhtmldir)/images && \
+ cp $(mylibdir)/vg_basic.css $(myhtmldir)/ && \
+ cp $(myimgdir)/*.png $(myhtmldir)/images && \
+ $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(myhtmldir)/ $(XSL_HTML_CHUNK_STYLE) $(myxmldir)/index.xml
# pdf and postscript
print-docs:
- @echo "Generating PDF file: $(printdir)/index.pdf (please be patient)...";
+ @echo "Generating PDF file: $(myprintdir)/index.pdf (please be patient)...";
export XML_CATALOG_FILES=$(XML_CATALOG_FILES) && \
- mkdir -p $(printdir) && \
- mkdir -p $(printdir)/images && \
- cp $(imgdir)/massif-graph-sm.png $(printdir)/images && \
- $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(printdir)/index.fo $(XSL_FO_STYLE) $(xmldir)/index.xml && \
- (cd $(printdir) && \
+ mkdir -p $(myprintdir) && \
+ mkdir -p $(myprintdir)/images && \
+ cp $(myimgdir)/massif-graph-sm.png $(myprintdir)/images && \
+ $(XSLTPROC) $(XSLTPROC_FLAGS) -o $(myprintdir)/index.fo $(XSL_FO_STYLE) $(myxmldir)/index.xml && \
+ (cd $(myprintdir) && \
( pdfxmltex index.fo && \
pdfxmltex index.fo && \
pdfxmltex index.fo ) &> $(LOGFILE) && \
- echo "Generating PS file: $(printdir)/index.ps ..." && \
+ echo "Generating PS file: $(myprintdir)/index.ps ..." && \
pdftops index.pdf && \
rm -f *.log *.aux *.fo *.out)
diff --git a/docs/internals/Makefile.am b/docs/internals/Makefile.am
index 8268843..e26ed18 100644
--- a/docs/internals/Makefile.am
+++ b/docs/internals/Makefile.am
@@ -1,5 +1,5 @@
EXTRA_DIST = \
- 3_0_BUGSTATUS 64-bit-cleanness.txt \
+ 3_0_BUGSTATUS.txt 64-bit-cleanness.txt \
darwin-notes.txt darwin-syscalls.txt \
directory-structure.txt \
m_replacemalloc.txt \
diff --git a/docs/xml/Makefile.am b/docs/xml/Makefile.am
index c07286e..0710d55 100644
--- a/docs/xml/Makefile.am
+++ b/docs/xml/Makefile.am
@@ -1,10 +1,11 @@
EXTRA_DIST = \
- index.xml \
FAQ.xml \
- manual.xml manual-intro.xml manual-core.xml \
- writing-tools.xml \
dist-docs.xml \
- tech-docs.xml \
+ index.xml \
licenses.xml \
+ manual.xml manual-intro.xml manual-core.xml \
+ quick-start-guide.xml \
+ writing-tools.xml \
+ tech-docs.xml \
vg-entities.xml \
xml_help.txt