diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2014-06-13 09:06:41 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2014-06-13 09:06:41 +0300 |
commit | 5131315a8153c70c7acc92a02323a47f6c563dfd (patch) | |
tree | 9ce57daaf0dfa8b17250d9cd500cb174b0e4d614 | |
parent | d555e435bba040506225dd3dc684e7101b1642dd (diff) | |
download | wydawca-5131315a8153c70c7acc92a02323a47f6c563dfd.tar.gz wydawca-5131315a8153c70c7acc92a02323a47f6c563dfd.tar.bz2 |
Bugfixes.
* configure.ac: Use subdir-objects Automake option.
* doc/Config: Put search form into the menu.
* doc/Makefile.am (check-sub-config): Fix sed expression.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/Config | 13 | ||||
-rw-r--r-- | doc/Makefile.am | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ef8f62e..908f20f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -21,7 +21,7 @@ AC_CONFIG_SRCDIR([src/wydawca.c]) | |||
21 | AC_CONFIG_AUX_DIR([build-aux]) | 21 | AC_CONFIG_AUX_DIR([build-aux]) |
22 | AC_CONFIG_HEADER([config.h]) | 22 | AC_CONFIG_HEADER([config.h]) |
23 | AC_CONFIG_MACRO_DIR(m4) | 23 | AC_CONFIG_MACRO_DIR(m4) |
24 | AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz std-options silent-rules]) | 24 | AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz std-options silent-rules subdir-objects]) |
25 | 25 | ||
26 | # Enable silent rules by default: | 26 | # Enable silent rules by default: |
27 | AM_SILENT_RULES([yes]) | 27 | AM_SILENT_RULES([yes]) |
@@ -42,6 +42,19 @@ $AFTER_BODY_OPEN=qq{ | |||
42 | <li><a href="${top_html_dir}/wydawca.html">Main</a></li> | 42 | <li><a href="${top_html_dir}/wydawca.html">Main</a></li> |
43 | <li><a href="${top_html_dir}/download.html">Downloads</a></li> | 43 | <li><a href="${top_html_dir}/download.html">Downloads</a></li> |
44 | <li><a class="active" href="${top_html_dir}/manual.html">Documentation</a></li> | 44 | <li><a class="active" href="${top_html_dir}/manual.html">Documentation</a></li> |
45 | <li> | ||
46 | <form method="post" action="/searchdoc" | ||
47 | enctype="application/x-www-form-urlencoded"> | ||
48 | <div> | ||
49 | <input id="searchinput" type="text" size="30" maxlength="255" name="q" valu | ||
50 | e="" /> | ||
51 | <input type="submit" name="search" value="Search" tabindex="12" /> | ||
52 | <input type="hidden" id="searchproject" name="p" value="wydawca" /> | ||
53 | <input type="hidden" name="t" value="searchdoc.in" /> | ||
54 | </div> | ||
55 | </form> | ||
56 | </li> | ||
57 | |||
45 | </ul>}; | 58 | </ul>}; |
46 | 59 | ||
47 | $PRE_BODY_CLOSE="Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved."; | 60 | $PRE_BODY_CLOSE="Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved."; |
diff --git a/doc/Makefile.am b/doc/Makefile.am index 2bb3e81..88ba67f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -66,7 +66,7 @@ check-config: | |||
66 | $(info_TEXINFOS) | 66 | $(info_TEXINFOS) |
67 | 67 | ||
68 | check-sub-config: | 68 | check-sub-config: |
69 | @sed -n '/wydawca_kw\[\] *= *{/,/^}/{p}' ../src/config.c ../src/tcpwrap.c|tr '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \ | 69 | @sed -n '/wydawca_kw\[\] *= *{/,/^}/{p}' ../src/config.c ../src/tcpwrap.c|tr '\n{' ' \n'|sed -n '/grecs_type_section/s/"\([^"]*\)".*grecs_type_section,[^,]*,[^,]*,[^,]*,[^,]*,[^,]*, *\(.*\) *}.*/\1 \2/p' | \ |
70 | while read ident kw; do \ | 70 | while read ident kw; do \ |
71 | $(CHECK_DOCS) "$$ident configuration statements" \ | 71 | $(CHECK_DOCS) "$$ident configuration statements" \ |
72 | "/$$kw"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ | 72 | "/$$kw"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ |