From 3d60fd76e8d8d3fb194fa7814ab928a828f40a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 29 Jul 2004 19:24:50 +0000 Subject: Better fix for 'make dist' with srcdir != builddir. CVS patchset: 6863 CVS date: 2004/07/29 19:24:50 --- doc/faq/Makefile.am | 4 ++-- doc/hackersguide/Makefile.am | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am index 7692541c3..9a4b259b0 100644 --- a/doc/faq/Makefile.am +++ b/doc/faq/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = README faq.sgml -docs_DATA = faq.html faq.txt +docs_DATA = $(srcdir)/faq.html $(srcdir)/faq.txt docsdir = $(prefix)/share/doc/xine/faq @@ -10,7 +10,7 @@ docs: $(docs_DATA) dist-hook: @touch $(addprefix $(srcdir)/, $(EXTRA_DIST)) @make fail_if_missing=yes docs - cp $(addprefix $(srcdir)/, $(docs_DATA)) $(distdir) + cp $(docs_DATA) $(distdir) faq.html: $(srcdir)/faq.sgml @if test "$(SGMLTOOLS)" != "no"; then \ diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am index 06bc47a19..6eb8b91a2 100644 --- a/doc/hackersguide/Makefile.am +++ b/doc/hackersguide/Makefile.am @@ -8,7 +8,8 @@ hackersguide_sgml = hackersguide.sgml \ stream.sgml \ output.sgml -docs_DATA = hackersguide.html architecture.png library.png overlays.png post_frame.png +docs_DATA = $(srcdir)/hackersguide.html \ + architecture.png library.png overlays.png post_frame.png EXTRA_DIST = README $(hackersguide_sgml) \ architecture.fig library.fig overlays.fig post_frame.fig @@ -20,7 +21,7 @@ docs: $(docs_DATA) dist-hook: @touch $(addprefix $(srcdir)/, $(EXTRA_DIST)) @make fail_if_missing=yes docs - cp $(addprefix $(srcdir)/, $(docs_DATA)) $(distdir) + cp $(docs_DATA) $(distdir) hackersguide.html: $(addprefix $(srcdir)/, $(hackersguide_sgml)) @if test "$(SGMLTOOLS)" != "no"; then \ -- cgit v1.2.3