From 6aebbf3d77fd0714f23e0335f8beafcdc715d4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 3 Aug 2004 19:35:11 +0000 Subject: The ultimate solution (like v!@gra? :-)) for 'make dist' and srcdir != builddir. CVS patchset: 6873 CVS date: 2004/08/03 19:35:11 --- doc/faq/Makefile.am | 19 +++++++++++-------- doc/hackersguide/Makefile.am | 18 +++++++++++++----- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am index 9a4b259b0..21d2851e0 100644 --- a/doc/faq/Makefile.am +++ b/doc/faq/Makefile.am @@ -1,33 +1,36 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = README faq.sgml -docs_DATA = $(srcdir)/faq.html $(srcdir)/faq.txt +docs_DATA = faq.html faq.txt docsdir = $(prefix)/share/doc/xine/faq -docs: $(docs_DATA) +docs: docs-prepare $(docs_DATA) + +docs-prepare: $(srcdir)/faq.sgml + test -f faq.sgml || cp $^ . dist-hook: @touch $(addprefix $(srcdir)/, $(EXTRA_DIST)) @make fail_if_missing=yes docs cp $(docs_DATA) $(distdir) -faq.html: $(srcdir)/faq.sgml +faq.html: faq.sgml @if test "$(SGMLTOOLS)" != "no"; then \ - $(SGMLTOOLS) -b onehtml $(srcdir)/faq.sgml; \ + $(SGMLTOOLS) -b onehtml faq.sgml; \ else if test "$(fail_if_missing)" = "yes"; then \ echo "Please install sgmltools-lite."; \ exit 1; \ - else touch faq.html; \ + else touch $@; \ fi; \ fi -faq.txt: $(srcdir)/faq.sgml +faq.txt: faq.sgml @if test "$(SGMLTOOLS)" != "no"; then \ - $(SGMLTOOLS) -b txt $(srcdir)/faq.sgml; \ + $(SGMLTOOLS) -b txt faq.sgml; \ else if test "$(fail_if_missing)" = "yes"; then \ echo "Please install sgmltools-lite."; \ exit 1; \ - else touch faq.txt; \ + else touch $@; \ fi; \ fi diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am index 6eb8b91a2..08c4110de 100644 --- a/doc/hackersguide/Makefile.am +++ b/doc/hackersguide/Makefile.am @@ -8,7 +8,7 @@ hackersguide_sgml = hackersguide.sgml \ stream.sgml \ output.sgml -docs_DATA = $(srcdir)/hackersguide.html \ +docs_DATA = hackersguide.html \ architecture.png library.png overlays.png post_frame.png EXTRA_DIST = README $(hackersguide_sgml) \ @@ -16,20 +16,28 @@ EXTRA_DIST = README $(hackersguide_sgml) \ docsdir = $(prefix)/share/doc/xine/hackersguide -docs: $(docs_DATA) +docs: docs-prepare $(docs_DATA) + +docs-prepare: $(addprefix $(srcdir)/, $(hackersguide_sgml)) + for file in $(hackersguide_sgml); do \ + test -f $$file || cp $(srcdir)/$$file .; \ + done dist-hook: @touch $(addprefix $(srcdir)/, $(EXTRA_DIST)) @make fail_if_missing=yes docs cp $(docs_DATA) $(distdir) -hackersguide.html: $(addprefix $(srcdir)/, $(hackersguide_sgml)) +$(hackersguide_sgml): $(addprefix $(srcdir)/,$(hackersguide_sgml)) + cp $^ . + +hackersguide.html: $(hackersguide_sgml) @if test "$(SGMLTOOLS)" != "no"; then \ - $(SGMLTOOLS) -b onehtml $(srcdir)/hackersguide.sgml; \ + $(SGMLTOOLS) -b onehtml hackersguide.sgml; \ else if test "$(fail_if_missing)" = "yes"; then \ echo "Please install sgmltools-lite."; \ exit 1; \ - else touch hackersguide.html; \ + else touch $@; \ fi; \ fi -- cgit v1.2.3