diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2015-01-06 14:20:40 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2015-01-06 14:20:40 +0200 |
commit | c5e668cfd92985ff7e3e4be7c6be8c3ea3e6d57f (patch) | |
tree | 39926189df6fa19ea1246cdc03e3c7cf5eaea889 | |
parent | d2964dda42f601c514d3e822dc5efd75ef456a40 (diff) | |
download | ellinika-c5e668cfd92985ff7e3e4be7c6be8c3ea3e6d57f.tar.gz ellinika-c5e668cfd92985ff7e3e4be7c6be8c3ea3e6d57f.tar.bz2 |
Minor changes
* Makefile.am: Use silent rule markers
* configure.ac: Enable silent rules, add Emacs magic
for AC_REVISION
* htdig: Remove.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | htdig/ellinika.conf | 53 | ||||
-rw-r--r-- | htdig/pl.conf | 17 | ||||
-rw-r--r-- | htdig/uk.conf | 19 |
5 files changed, 13 insertions, 92 deletions
diff --git a/Makefile.am b/Makefile.am index 2e4dd7e..678c978 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -25,7 +25,7 @@ html_DATA = style.css .htaccess maint.css index.html maint.html | |||
25 | EXTRA_DIST=.htaccess.in maint.css index.html maint.html | 25 | EXTRA_DIST=.htaccess.in maint.css index.html maint.html |
26 | 26 | ||
27 | install-html: | 27 | install-html: |
28 | top_srcdir=`cd $(top_srcdir);pwd`; \ | 28 | $(AM_V_GEN)top_srcdir=`cd $(top_srcdir);pwd`; \ |
29 | for dir in pl ru uk; do \ | 29 | for dir in pl ru uk; do \ |
30 | here=`pwd`; \ | 30 | here=`pwd`; \ |
31 | if test -d $(top_srcdir)/html/$$dir; then \ | 31 | if test -d $(top_srcdir)/html/$$dir; then \ |
diff --git a/configure.ac b/configure.ac index 01b27a2..540b4f6 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -17,15 +17,18 @@ | |||
17 | 17 | ||
18 | AC_PREREQ(2.61) | 18 | AC_PREREQ(2.61) |
19 | 19 | ||
20 | AC_REVISION($Revision: 557 $) | 20 | AC_REVISION(2015-01-06 13:50:03 gray) |
21 | AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua]) | 21 | AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua]) |
22 | AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4) | 22 | AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4) |
23 | AC_CONFIG_AUX_DIR([build-aux]) | 23 | AC_CONFIG_AUX_DIR([build-aux]) |
24 | AC_CANONICAL_SYSTEM | 24 | AC_CANONICAL_SYSTEM |
25 | AM_INIT_AUTOMAKE([1.11 no-exeext]) | 25 | AM_INIT_AUTOMAKE([1.11 silent-rules no-exeext]) |
26 | AM_CONFIG_HEADER([config.h]) | 26 | AM_CONFIG_HEADER([config.h]) |
27 | AC_CONFIG_MACRO_DIR([m4]) | 27 | AC_CONFIG_MACRO_DIR([m4]) |
28 | 28 | ||
29 | # Enable silent rules by default: | ||
30 | AM_SILENT_RULES([yes]) | ||
31 | |||
29 | ## * Checks for programs. | 32 | ## * Checks for programs. |
30 | AC_PROG_CC | 33 | AC_PROG_CC |
31 | AC_PROG_YACC | 34 | AC_PROG_YACC |
@@ -146,3 +149,10 @@ AC_CONFIG_FILES(Makefile | |||
146 | po/Makefile.in) | 149 | po/Makefile.in) |
147 | 150 | ||
148 | AC_OUTPUT | 151 | AC_OUTPUT |
152 | |||
153 | dnl Local variables: | ||
154 | dnl eval: (add-hook 'write-file-hooks 'time-stamp) | ||
155 | dnl time-stamp-start: "AC_REVISION(" | ||
156 | dnl time-stamp-end: ")" | ||
157 | dnl time-stamp-line-limit: 20 | ||
158 | dnl end: | ||
diff --git a/htdig/ellinika.conf b/htdig/ellinika.conf deleted file mode 100644 index 1645ea8..0000000 --- a/htdig/ellinika.conf +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | database_dir: /var/htdig/db | ||
2 | start_url: http://ellinika.gnu.org.ua | ||
3 | limit_urls_to: ${start_url} | ||
4 | exclude_urls: /cgi-bin/ .cgi .scm | ||
5 | bad_extensions: .wav .gz .z .sit .au .zip .tar .hqx .exe .com .png \ | ||
6 | .jpg .jpeg .aiff .class .map .ram .tgz .bin .rpm .mpg .mov \ | ||
7 | .avi .css .rss .mp3 | ||
8 | |||
9 | maintainer: gray@gnu.org.ua | ||
10 | |||
11 | max_head_length: 10000 | ||
12 | max_doc_size: 200000 | ||
13 | no_excerpt_show_top: true | ||
14 | |||
15 | search_algorithm: exact:1 accents:0.8 synonyms:0.5 endings:0.1 | ||
16 | |||
17 | allow_in_form: lang | ||
18 | search_results_wrapper: /home/gray/public_html/ellinika/${lang}/htdig.html | ||
19 | nothing_found_file: /home/gray/public_html/ellinika/${lang}/nomatch.html | ||
20 | |||
21 | next_page_text: <img src="/htdig/graphics/buttonr.png" border="0" align="middle" width="30" height="30" alt="next"> | ||
22 | no_next_page_text: | ||
23 | prev_page_text: <img src="/htdig/graphics/buttonl.png" border="0" align="middle" width="30" height="30" alt="prev"> | ||
24 | no_prev_page_text: | ||
25 | page_number_text: '<img src="/htdig/graphics/button1.png" border="0" align="middle" width="30" height="30" alt="1">' \ | ||
26 | '<img src="/htdig/graphics/button2.png" border="0" align="middle" width="30" height="30" alt="2">' \ | ||
27 | '<img src="/htdig/graphics/button3.png" border="0" align="middle" width="30" height="30" alt="3">' \ | ||
28 | '<img src="/htdig/graphics/button4.png" border="0" align="middle" width="30" height="30" alt="4">' \ | ||
29 | '<img src="/htdig/graphics/button5.png" border="0" align="middle" width="30" height="30" alt="5">' \ | ||
30 | '<img src="/htdig/graphics/button6.png" border="0" align="middle" width="30" height="30" alt="6">' \ | ||
31 | '<img src="/htdig/graphics/button7.png" border="0" align="middle" width="30" height="30" alt="7">' \ | ||
32 | '<img src="/htdig/graphics/button8.png" border="0" align="middle" width="30" height="30" alt="8">' \ | ||
33 | '<img src="/htdig/graphics/button9.png" border="0" align="middle" width="30" height="30" alt="9">' \ | ||
34 | '<img src="/htdig/graphics/button10.png" border="0" align="middle" width="30" height="30" alt="10">' | ||
35 | # | ||
36 | # To make the current page stand out, we will put a border around the | ||
37 | # image for that page. | ||
38 | # | ||
39 | no_page_number_text: '<img src="/htdig/graphics/button1.png" border="2" align="middle" width="30" height="30" alt="1">' \ | ||
40 | '<img src="/htdig/graphics/button2.png" border="2" align="middle" width="30" height="30" alt="2">' \ | ||
41 | '<img src="/htdig/graphics/button3.png" border="2" align="middle" width="30" height="30" alt="3">' \ | ||
42 | '<img src="/htdig/graphics/button4.png" border="2" align="middle" width="30" height="30" alt="4">' \ | ||
43 | '<img src="/htdig/graphics/button5.png" border="2" align="middle" width="30" height="30" alt="5">' \ | ||
44 | '<img src="/htdig/graphics/button6.png" border="2" align="middle" width="30" height="30" alt="6">' \ | ||
45 | '<img src="/htdig/graphics/button7.png" border="2" align="middle" width="30" height="30" alt="7">' \ | ||
46 | '<img src="/htdig/graphics/button8.png" border="2" align="middle" width="30" height="30" alt="8">' \ | ||
47 | '<img src="/htdig/graphics/button9.png" border="2" align="middle" width="30" height="30" alt="9">' \ | ||
48 | '<img src="/htdig/graphics/button10.png" border="2" align="middle" width="30" height="30" alt="10">' | ||
49 | |||
50 | # local variables: | ||
51 | # mode: text | ||
52 | # eval: (if (eq window-system 'x) (progn (setq font-lock-keywords (list '("^#.*" . font-lock-keyword-face) '("^[a-zA-Z][^ :]+" . font-lock-function-name-face) '("[+$]*:" . font-lock-comment-face) )) (font-lock-mode))) | ||
53 | # end: | ||
diff --git a/htdig/pl.conf b/htdig/pl.conf deleted file mode 100644 index 46fa9e9..0000000 --- a/htdig/pl.conf +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | include: ellinika.conf | ||
2 | |||
3 | template_map: Pełny long builtin-long \ | ||
4 | Zwęzły short builtin-short | ||
5 | |||
6 | sort_names: score Ocena \ | ||
7 | time Czas \ | ||
8 | title Tytuł \ | ||
9 | revscore 'Ocena odwrotna' \ | ||
10 | revtime 'Czas odwrotny' \ | ||
11 | revtitle 'Tytuł odwrotny' | ||
12 | |||
13 | method_names: and 'Wszystkie słowa' \ | ||
14 | or 'Którekolwiek ze slów' \ | ||
15 | boolean 'Operacje logiczne' | ||
16 | |||
17 | boolean_keywords: i albo nie \ No newline at end of file | ||
diff --git a/htdig/uk.conf b/htdig/uk.conf deleted file mode 100644 index bdccd0c..0000000 --- a/htdig/uk.conf +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | include: ellinika.conf | ||
2 | |||
3 | locale: uk_UA.UTF-8 | ||
4 | |||
5 | template_map: Повний long builtin-long \ | ||
6 | Скорочений short builtin-short | ||
7 | |||
8 | sort_names: score Оцінка \ | ||
9 | time Час \ | ||
10 | title Назва \ | ||
11 | revscore 'Зворотна оцінка' \ | ||
12 | revtime 'Зворотний час' \ | ||
13 | revtitle 'Зворотна назва' | ||
14 | |||
15 | method_names: and 'Всі слова' \ | ||
16 | or 'Будь-яке слово' \ | ||
17 | boolean 'Булеві операціЇ' | ||
18 | |||
19 | boolean_keywords: і або не \ No newline at end of file | ||