# HG changeset patch
# User jwe
# Date 1142981584 0
# Node ID 5b9b492f9e98903ee66b062d82e34f391920fc68
# Parent  0a26811c98be478aa84784bc2df559ce882e668a
[project @ 2006-03-21 22:53:04 by jwe]

diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,7 +1,21 @@
 2006-03-21  John W. Eaton  <jwe@octave.org>
 
+	* liboctave/Makefile.in (FORMATTED): Omit .html files here.
+	(DISTDIRS): New variable.
+	(dist): Handle $(DISTDIRS) here.
+
+	* faq/Makefile.in (FORMATTED): Omit .html files here.
+	(DISTDIRS): New variable.
+	(dist): Handle $(DISTDIRS) here.
+
+	* interpreter/Makefile.in (FORMATTED): Omit .html files here.
+	(DISTDIRS): New variable.
+	(dist): Handle $(DISTDIRS) here.
+
 	* interpreter/sparse.txi: Temporarily omit figures.
 	* interpreter/Makefile.in: Temporarily omit actions for making figures.
+	(DISTSUBDIRS): New macro.
+	(dist): Recurse into $(DISTSUBDIRS) here.
 
 	* interpreter/Makefile.in (real-pdf): Depend on stamp-eps
 	(stamp-pdf): Depend on real-pdf.  Touch stamp-pdf here.
diff --git a/doc/faq/Makefile.in b/doc/faq/Makefile.in
--- a/doc/faq/Makefile.in
+++ b/doc/faq/Makefile.in
@@ -22,11 +22,12 @@
 
 TEXINFO := Octave-FAQ.texi
 
-FORMATTED := Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf \
-	Octave-FAQ*.html
+FORMATTED := Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf
 
 DISTFILES := Makefile.in $(TEXINFO) $(FORMATTED)
 
+DISTDIRS := HTML
+
 SPELL := $(patsubst %.texi, %.spell, $(ALL_TEXINFO))
 
 %.spell : %.texi
@@ -83,4 +84,5 @@
 
 dist: all
 	ln $(DISTFILES) ../../`cat ../../.fname`/doc/faq
+	for dir in $(DISTDIRS); do ln -s ../../../doc/faq/$$dir ../../`cat ../../.fname`/doc/faq/$$dir; done
 .PHONY: dist
diff --git a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -41,8 +41,7 @@
 TEXINFO := $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
 
 FORMATTED = octave.dvi octave.ps octave.pdf \
-	octave.info octave.info-[0-9]* \
-	octave.html octave_*.html
+	octave.info octave.info-[0-9]*
 
 MAN_BASE := mkoctfile octave octave-bug octave-config
 MAN_SRC := $(addsuffix .1, $(MAN_BASE))
@@ -51,6 +50,10 @@
 DISTFILES = Makefile.in dir munge-texi.cc $(MAN_SRC) \
   $(SOURCES) $(TEXINFO) $(FORMATTED)
 
+DISTDIRS = HTML
+
+DISTSUBDIRS = $(IMAGEDIR)
+
 # Look for version.h to get version information.
 xfiles := $(TOPDIR)/src/version.h $(srcdir)/$(TOPDIR)/src/version.h
 
@@ -221,4 +224,6 @@
 
 dist: clean-texi all
 	ln $(DISTFILES) ../../`cat ../../.fname`/doc/interpreter
+	for dir in $(DISTDIRS); do ln -s ../../../doc/interpreter/$$dir ../../`cat ../../.fname`/doc/interpreter/$$dir; done
+	for dir in $(DISTSUBDIRS); do mkdir ../../`cat ../../.fname`/doc/interpreter/$$dir; $(MAKE) -C $$dir $@; done
 .PHONY: dist
diff --git a/doc/liboctave/Makefile.in b/doc/liboctave/Makefile.in
--- a/doc/liboctave/Makefile.in
+++ b/doc/liboctave/Makefile.in
@@ -30,11 +30,12 @@
 
 TEXINFO = $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
 
-FORMATTED = liboctave.dvi liboctave.ps liboctave.pdf \
-	liboctave.info liboctave*.html
+FORMATTED = liboctave.dvi liboctave.ps liboctave.pdf liboctave.info
 
 DISTFILES = Makefile.in gpl.texi $(TEXINFO) $(FORMATTED)
 
+DISTDIRS = HTML
+
 SPELL = $(patsubst %.texi, %.spell, $(TEXINFO))
 
 %.spell : %.texi
@@ -99,4 +100,5 @@
 
 dist: all
 	ln $(DISTFILES) ../../`cat ../../.fname`/doc/liboctave
+	for dir in $(DISTDIRS); do ln -s ../../../doc/liboctave/$$dir ../../`cat ../../.fname`/doc/liboctave/$$dir; done
 .PHONY: dist