Mercurial > hg > octave-lyh

changeset 8940:6994961bf1f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use doc-cache instead of DOC for doc cache file name
author John W. Eaton <jwe@octave.org>
date Mon, 09 Mar 2009 14:31:10 -0400
parents 4e1fed5d847b
children b8ed0262b11e
files ChangeLog Makeconf.in configure.in doc/ChangeLog doc/interpreter/Makefile.in run-octave.in scripts/ChangeLog scripts/help/gen_doc_cache.m scripts/help/lookfor.m
diffstat 9 files changed, 25 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-09  John W. Eaton  <jwe@octave.org>
 
+	* run-octave.in: Use doc-cache instead of DOC for doc cache file.
+	* configure.in: Likewise.
+
 	* configure.in (--enable-extra-warning-flags): New option to
 	control extra compiler warning flags.
 	(--enable-strict-warning-flags): Rename from --enable-picky-flags.
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -291,7 +291,7 @@
 
 libdir = @libdir@
 
-# Where to install and expect extra files like NEWS and DOC.
+# Where to install and expect extra files like NEWS and doc-cache.
 octetcdir = @octetcdir@
 
 # Where to install and expect libraries like libcruft.a, liboctave.a,
--- a/configure.in
+++ b/configure.in
@@ -89,7 +89,7 @@
 
 OCTAVE_SET_DEFAULT(man1dir, '$(mandir)/man1')
 OCTAVE_SET_DEFAULT(man1ext, '.1')
-OCTAVE_SET_DEFAULT(doc_cache_file, '$(octetcdir)/DOC')
+OCTAVE_SET_DEFAULT(doc_cache_file, '$(octetcdir)/doc-cache')
 OCTAVE_SET_DEFAULT(infofile, '$(infodir)/octave.info')
 OCTAVE_SET_DEFAULT(octincludedir, '$(includedir)/octave-$(version)')
 OCTAVE_SET_DEFAULT(fcnfiledir, '$(datadir)/octave/$(version)/m')
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-09  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/Makefile.in (DISTFILES): Use doc-cache instead of
+	DOC for doc cache file.
+
 2009-03-08  Søren Hauberg  <hauberg@gmail.com>
 
 	* interpreter/stats.txi (Basic Statistical Functions):
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -150,7 +150,7 @@
 DISTFILES = $(addprefix $(srcdir)/, Makefile.in contributors.in \
   mkcontrib.awk dir  munge-texi.cc $(MAN_SRC) $(SOURCES) $(MAIN_TEXINFO)) \
   $(SUB_TEXINFO) contributors.texi $(FORMATTED) $(IMAGES) mk_doc_cache.m \
-  DOC stmp-html
+  doc-cache stmp-html
 
 DISTDIRS = HTML
 
@@ -170,13 +170,13 @@
 	$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@-t
 	mv $@-t $@
 
-all: octave.info octave.pdf octave-a4.pdf HTML/index.html DOC
+all: octave.info octave.pdf octave-a4.pdf HTML/index.html doc-cache
 .PHONY: all
 
 DOCSTRING_FILES := $(TOPDIR)/src/DOCSTRINGS $(TOPDIR)/scripts/DOCSTRINGS
 
-DOC: $(DOCSTRING_FILES) mk_doc_cache.m
-	$(TOPDIR)/run-octave -f -q -H $(srcdir)/mk_doc_cache.m DOC $(DOCSTRING_FILES) || rm -f DOC
+doc-cache: $(DOCSTRING_FILES) mk_doc_cache.m
+	$(TOPDIR)/run-octave -f -q -H $(srcdir)/mk_doc_cache.m doc-cache $(DOCSTRING_FILES) || rm -f doc-cache
 
 $(TEXINFO): $(DOCSTRING_FILES) munge-texi$(BUILD_EXEEXT)
 
@@ -330,14 +330,14 @@
 	    $(INSTALL_DATA) $(srcdir)/dir $(DESTDIR)$(infodir)/dir; \
 	  fi; \
 	fi
-	$(INSTALL_DATA) DOC $(DESTDIR)$(octetcdir)/DOC
+	$(INSTALL_DATA) doc-cache $(DESTDIR)$(octetcdir)/doc-cache
 .PHONY: install install-strip
 
 uninstall:
 	@$(subdir-for-command)
 	rm -f $(DESTDIR)$(infodir)/octave.info*
 	rm -f $(DESTDIR)$(infodir)/dir
-	rm -f $(DESTDIR)$(octetcdir)/DOC
+	rm -f $(DESTDIR)$(octetcdir)/doc-cache
 	for f in $(MAN_BASE); do rm -f $(DESTDIR)$(man1dir)/$$f$(man1ext); done
 .PHONY: uninstall
 
@@ -376,7 +376,7 @@
 .PHONY: distclean
 
 maintainer-clean: distclean clean-texi
-	rm -f DOC stmp-html $(FORMATTED) $(IMAGES)
+	rm -f doc-cache stmp-html $(FORMATTED) $(IMAGES)
 	rm -rf HTML
 .PHONY: maintainer-clean
 
--- a/run-octave.in
+++ b/run-octave.in
@@ -51,7 +51,7 @@
 
 LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path"
 IMAGEPATH="$top_srcdir/scripts/image"
-DOCFILE="$builddir/doc/interpreter/DOC"
+DOCFILE="$builddir/doc/interpreter/doc-cache"
 INFOFILE="$builddir/doc/interpreter/octave.info"
 
 if [ $# -gt 0 ]; then
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-09  John W. Eaton  <jwe@octave.org>
+
+	* help/gen_doc_cache.m, help/lookfor.m: Use doc-cache instead of
+	DOC for doc cache file.
+
 2009-03-09  Jaroslav Hajek  <highegg@gmail.com>
 
 	* general/accumarray.m: Reorder tests. Call either "sparse" or
--- a/scripts/help/gen_doc_cache.m
+++ b/scripts/help/gen_doc_cache.m
@@ -28,7 +28,7 @@
 ## @seealso{lookfor, path}
 ## @end deftypefn
 
-function gen_doc_cache (out_file = "DOC", directory = [])
+function gen_doc_cache (out_file = "doc-cache", directory = [])
   ## Check input
   if (!ischar (out_file))
     print_usage ();
--- a/scripts/help/lookfor.m
+++ b/scripts/help/lookfor.m
@@ -75,7 +75,7 @@
 
   for n = 1:numel (new_path)
     elt = new_path{n};
-    cache_file = fullfile (elt, "DOC");
+    cache_file = fullfile (elt, "doc-cache");
     if (exist (cache_file, "file"))
       ## We have a cache in the directory, then read it and search it!
       [funs, hts] = search_cache (str, cache_file, search_type);