# HG changeset patch # User John W. Eaton # Date 1236623470 14400 # Node ID 6994961bf1f41e43e91f72f2240c642863d1fc4c # Parent 4e1fed5d847bedd1ccdc07b5048fcd69ece0880a use doc-cache instead of DOC for doc cache file name diff -r 4e1fed5d847b -r 6994961bf1f4 ChangeLog --- a/ChangeLog Mon Mar 09 13:36:11 2009 -0400 +++ b/ChangeLog Mon Mar 09 14:31:10 2009 -0400 @@ -1,5 +1,8 @@ 2009-03-09 John W. Eaton + * 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. diff -r 4e1fed5d847b -r 6994961bf1f4 Makeconf.in --- a/Makeconf.in Mon Mar 09 13:36:11 2009 -0400 +++ b/Makeconf.in Mon Mar 09 14:31:10 2009 -0400 @@ -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, diff -r 4e1fed5d847b -r 6994961bf1f4 configure.in --- a/configure.in Mon Mar 09 13:36:11 2009 -0400 +++ b/configure.in Mon Mar 09 14:31:10 2009 -0400 @@ -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') diff -r 4e1fed5d847b -r 6994961bf1f4 doc/ChangeLog --- a/doc/ChangeLog Mon Mar 09 13:36:11 2009 -0400 +++ b/doc/ChangeLog Mon Mar 09 14:31:10 2009 -0400 @@ -1,3 +1,8 @@ +2009-03-09 John W. Eaton + + * interpreter/Makefile.in (DISTFILES): Use doc-cache instead of + DOC for doc cache file. + 2009-03-08 Søren Hauberg * interpreter/stats.txi (Basic Statistical Functions): diff -r 4e1fed5d847b -r 6994961bf1f4 doc/interpreter/Makefile.in --- a/doc/interpreter/Makefile.in Mon Mar 09 13:36:11 2009 -0400 +++ b/doc/interpreter/Makefile.in Mon Mar 09 14:31:10 2009 -0400 @@ -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 diff -r 4e1fed5d847b -r 6994961bf1f4 run-octave.in --- a/run-octave.in Mon Mar 09 13:36:11 2009 -0400 +++ b/run-octave.in Mon Mar 09 14:31:10 2009 -0400 @@ -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 diff -r 4e1fed5d847b -r 6994961bf1f4 scripts/ChangeLog --- a/scripts/ChangeLog Mon Mar 09 13:36:11 2009 -0400 +++ b/scripts/ChangeLog Mon Mar 09 14:31:10 2009 -0400 @@ -1,3 +1,8 @@ +2009-03-09 John W. Eaton + + * help/gen_doc_cache.m, help/lookfor.m: Use doc-cache instead of + DOC for doc cache file. + 2009-03-09 Jaroslav Hajek * general/accumarray.m: Reorder tests. Call either "sparse" or diff -r 4e1fed5d847b -r 6994961bf1f4 scripts/help/gen_doc_cache.m --- a/scripts/help/gen_doc_cache.m Mon Mar 09 13:36:11 2009 -0400 +++ b/scripts/help/gen_doc_cache.m Mon Mar 09 14:31:10 2009 -0400 @@ -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 (); diff -r 4e1fed5d847b -r 6994961bf1f4 scripts/help/lookfor.m --- a/scripts/help/lookfor.m Mon Mar 09 13:36:11 2009 -0400 +++ b/scripts/help/lookfor.m Mon Mar 09 14:31:10 2009 -0400 @@ -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);