aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am3
-rw-r--r--Makefile.in15
3 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 4cdbdfb..c592630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-12-24 Ben Elliston <bje@gnu.org>
+ * Makefile.am (XML): Include $(srcdir) in filenames.
+ * Makefile.in: Regenerate.
+
+2005-12-24 Ben Elliston <bje@gnu.org>
+
* doc/C/Makefile.am: Remove.
* doc/C/Makefile.in: Likewise.
diff --git a/Makefile.am b/Makefile.am
index 54f542e..1845822 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -203,7 +203,8 @@ unit_SOURCES = testsuite/libdejagnu/unit.cc
dist_man_MANS = doc/runtest.1
info_TEXINFOS = doc/dejagnu.texi
-XML = doc/dejagnu.xml doc/legal.xml doc/ref.xml doc/user.xml
+XML = $(srcdir)/doc/dejagnu.xml $(srcdir)/doc/legal.xml $(srcdir)/doc/ref.xml \
+ $(srcdir)/doc/user.xml
dejagnu.pdf: $(XML)
docbook2pdf $(srcdir)/doc/dejagnu.xml
diff --git a/Makefile.in b/Makefile.in
index 501ea53..8808ec0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -399,7 +399,9 @@ unit_SOURCES = testsuite/libdejagnu/unit.cc
# Documentation.
dist_man_MANS = doc/runtest.1
info_TEXINFOS = doc/dejagnu.texi
-XML = doc/dejagnu.xml doc/legal.xml doc/ref.xml doc/user.xml
+XML = $(srcdir)/doc/dejagnu.xml $(srcdir)/doc/legal.xml $(srcdir)/doc/ref.xml \
+ $(srcdir)/doc/user.xml
+
# Packaging.
PACKAGING_METAFILES = packaging/depot/dejagnu.psf \
@@ -676,10 +678,11 @@ dist-info: $(INFO_DEPS)
done
mostlyclean-aminfo:
- -rm -rf dejagnu.aux dejagnu.cp dejagnu.cps dejagnu.fn dejagnu.ky dejagnu.log \
- dejagnu.pg dejagnu.pgs dejagnu.tmp dejagnu.toc dejagnu.tp \
- dejagnu.tps dejagnu.vr dejagnu.vrs doc/dejagnu.dvi \
- doc/dejagnu.pdf doc/dejagnu.ps doc/dejagnu.html
+ -rm -rf dejagnu.aux dejagnu.cp dejagnu.cps dejagnu.fn dejagnu.fns dejagnu.ky \
+ dejagnu.kys dejagnu.log dejagnu.pg dejagnu.pgs dejagnu.tmp \
+ dejagnu.toc dejagnu.tp dejagnu.tps dejagnu.vr dejagnu.vrs \
+ doc/dejagnu.dvi doc/dejagnu.pdf doc/dejagnu.ps \
+ doc/dejagnu.html
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -1174,7 +1177,7 @@ dejagnu.rtf: $(XML)
html:
docbook2html -o html $(srcdir)/doc/dejagnu.xml
-dejagnu.texi: $(XML)
+doc/dejagnu.texi: $(XML)
db2x_xsltproc -s texi $(srcdir)/doc/dejagnu.xml -o dejagnu.txml
db2x_texixml dejagnu.txml
mv dejagnu.texi $(srcdir)/doc