# HG changeset patch # User John W. Eaton # Date 1454804339 18000 # Node ID 7eca4ba9bb6dc56a8419fd241ab1c0d1bee879e6 # Parent 2cf8bc5c70177cd35a8502c825ec7312ae342f1f also distribute octave.css from source tree * doc/module.mk (HTMLDIR_CSS): Rename from OCTAVE_HTML_CSS. Change all uses. (OCTAVE_CSS): New variable. doc_EXTRA_DIST: include $(OCTAVE_CSS) in the list instead of $(HTMLDIR_CSS). diff -r 2cf8bc5c7017 -r 7eca4ba9bb6d doc/module.mk --- a/doc/module.mk Sat Feb 06 08:48:47 2016 -0500 +++ b/doc/module.mk Sat Feb 06 19:18:59 2016 -0500 @@ -258,9 +258,11 @@ OCTAVE_HTML_DIR = doc/interpreter/octave.html OCTAVE_HTML_TMP_DIR = $(OCTAVE_HTML_DIR:.html=.htp) -OCTAVE_HTML_CSS = $(OCTAVE_HTML_DIR)/octave.css OCTAVE_HTML_STAMP = $(OCTAVE_HTML_DIR)/.octave-html-stamp +OCTAVE_CSS = doc/interpreter/octave.css +HTMLDIR_CSS = $(OCTAVE_HTML_DIR)/octave.css + $(srcdir)/doc/interpreter/octave.info: $(DOC_IMAGES_TXT) $(octave_TEXINFOS) doc/interpreter/octave.dvi: $(DOC_IMAGES_EPS) $(octave_TEXINFOS) doc/interpreter/octave.pdf: $(DOC_IMAGES_PDF) $(octave_TEXINFOS) @@ -316,7 +318,7 @@ rm -rf $(OCTAVE_HTML_TMP_DIR); exit 1; \ fi -$(HTMLDIR_IMAGES) $(OCTAVE_HTML_CSS) : doc/interpreter/octave.html/%: doc/interpreter/% $(OCTAVE_HTML_STAMP) +$(HTMLDIR_IMAGES) $(HTMLDIR_CSS) : doc/interpreter/octave.html/%: doc/interpreter/% $(OCTAVE_HTML_STAMP) $(AM_V_GEN)cp $< $@ DOC_TARGETS += \ @@ -326,7 +328,7 @@ doc/interpreter/octave.pdf \ $(OCTAVE_HTML_STAMP) \ $(HTMLDIR_IMAGES) \ - $(OCTAVE_HTML_CSS) + $(HTMLDIR_CSS) doc_EXTRA_DIST += \ $(BUILT_OCTAVE_TEXI_SRC) \ @@ -338,7 +340,7 @@ doc/interpreter/octave.pdf \ doc/interpreter/octave.html \ $(HTMLDIR_IMAGES) \ - $(OCTAVE_HTML_CSS) + $(OCTAVE_CSS) # Prevent packaging of distribution unless all libraries # necessary to create documentation are present