Makeinfo is now used to produce html manual.

darcs-hash:20071023134349-f2ef6-174321aa1d491d03b5cd356e3369889e1cf4c403.gz

diff --git a/doc/Makefile b/doc/Makefile
index 0e10dacf8fc0fab6294bff56a69520b53f83c1ee..39e2ecb539679f4eb094211770a8343385600725 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -15,14 +15,15 @@ PDF_FIGS = $(patsubst %.png,%.pdf,$(PNG_FIGS))
 %.txt: %.texinfo
        makeinfo --no-headers --force -o $@ $<
 
-%.html: %.texinfo Makefile
-       texi2html --l2h $<
+%.html: %.texinfo
+       makeinfo --html --no-split $< -o $@
+#      texi2html --l2h $<
 # Fix texinfo HTML output
-       perl -w -n -e 'if (/<div class="contents">/) {$$toc=1}' \
-                  -e 'if (!$$toc) { s/class="toc"//}' \
-                  -e '@match=/\[ ([^ ]+) \]/; if (@match > 0 && -r $$match[0] . ".png") { s/\[ ([^ ]+) \]/<img src="$$1.png"><\/img>/ }' \
-                  -e 'print;' < $@ > $@.tmp
-       mv $@.tmp $@
+#      perl -w -n -e 'if (/<div class="contents">/) {$$toc=1}' \
+#                 -e 'if (!$$toc) { s/class="toc"//}' \
+#                 -e '@match=/\[ ([^ ]+) \]/; if (@match > 0 && -r $$match[0] . ".png") { s/\[ ([^ ]+) \]/<img src="$$1.png"><\/img>/ }' \
+#                 -e 'print;' < $@ > $@.tmp
+#      mv $@.tmp $@
 
 clean:
        rm -f $(SOURCE).{aux,cp,cps,fn,ky,log,pg,toc,tp,vr,vrs} $(PDF_FIGS)

diff --git a/doc/omk-manual.texinfo b/doc/omk-manual.texinfo
index 77f61cb96e919dd87698ce7ae1848c33120915d7..2e161fb922227681a91a29abe6e369e810bff41a 100644 (file)
--- a/doc/omk-manual.texinfo
+++ b/doc/omk-manual.texinfo
@@ -1,7 +1,7 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
-@setfilename omk
-@settitle Ocera Make System
+@setfilename omk-manual
+@settitle OMK: Ocera Make System
 @c %**end of header
 
 @copying
@@ -285,7 +285,7 @@ temporarily with debugging information:
 @anchor{V}
 @defvar V
 If this variable equals to @samp{1}, the whole command lines for all
-executed commands are displayed. Otherwise, only a short messages are
+executed commands are displayed. Otherwise, only short messages are
 printed.
 @end defvar
 
@@ -310,16 +310,16 @@ source @file{test.c}.
   compiled in this directory.
 @end defvar
 
-@defvar @var{program name}_SOURCES
-  For every program name in @code{bin_PROGRAMS}, this variable contains
-  a list of sources that are needed to compile the executable. OMK uses
-  an extension of the filename to determine the compiler to compile this
-  source.
+@defvar xxx_SOURCES
+  For every program name @var{xxx} in @code{bin_PROGRAMS}, this variable
+  contains a list of sources that are needed to compile the
+  executable. OMK uses an extension of the filename to determine the
+  compiler to compile this source.
 @end defvar
 
-@defvar @var{program name}_LIBS
-  This variable contains a list of libraries the program @var{program
-  name} will be linked with.
+@defvar xxx_LIBS
+  This variable contains a list of libraries the program @var{xxx} will
+  be linked with.
 
   @example
   test_LIBS = m curses
@@ -386,8 +386,8 @@ programs.
   Specifies a list of dynamically linked libraries to be compiled. 
 @end defvar
 
-@defvar @var{library name}_SOURCES
-  For every library name in @code{lib_LIBRARIES} or
+@defvar xxx_SOURCES
+  For every library name @var{xxx} in @code{lib_LIBRARIES} or
   @code{shared_LIBRARIES}, this variable contains a list of sources that
   are needed to compile the library. OMK uses an extension of the
   filename to determine the compiler to compile this source.
@@ -641,7 +641,7 @@ LOCAL_CONFIG_H = myconfig.h
   appear in the header file.
 @end defvar
 
-@defvar @var{xxx}_DEFINES
+@defvar xxx_DEFINES
   This variable determines the configuration parameters that should be
   stored in a header file specified by
   @code{config_include_HEADERS}. The @var{xxx} in the name of this