Mercurial > octave

changeset 21212:7eca4ba9bb6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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).
author John W. Eaton <jwe@octave.org>
date Sat, 06 Feb 2016 19:18:59 -0500
parents 2cf8bc5c7017
children f7d1050b9b53
files doc/module.mk
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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