summaryrefslogtreecommitdiffabout
path: root/src/ellinika
authorSergey Poznyakoff <gray@gnu.org.ua>2011-06-20 10:05:27 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2011-06-20 10:05:27 (GMT)
commit2bf7460851d3d03274d1b5f979b943cb00f1813e (patch) (side-by-side diff)
tree70533c308dd6e2376e72753859120ea1a8d29ae0 /src/ellinika
parentb56552e3260023593a3bf80315edf0f069eebac1 (diff)
downloadellinika-2bf7460851d3d03274d1b5f979b943cb00f1813e.tar.gz
ellinika-2bf7460851d3d03274d1b5f979b943cb00f1813e.tar.bz2
Improve coupling between dict and conj.
* po/pl.po: Update * src/cgi-bin/conj.scm4: Use cgi-program-name to generate references to dict. * src/cgi-bin/dict.scm4: Add a reference to conjugator (for verbs). * src/ellinika/Makefile.am: Define SCRIP_SUFFIX * src/ellinika/cgi.scm4 (cgi-program-name): New function. * style.css: Update.
Diffstat (limited to 'src/ellinika') (more/less context) (ignore whitespace changes)
-rw-r--r--src/ellinika/Makefile.am21
-rw-r--r--src/ellinika/cgi.scm45
2 files changed, 16 insertions, 10 deletions
diff --git a/src/ellinika/Makefile.am b/src/ellinika/Makefile.am
index 01534c0..12e0392 100644
--- a/src/ellinika/Makefile.am
+++ b/src/ellinika/Makefile.am
@@ -32,16 +32,17 @@ cgi.m4: Makefile
echo 'changecom([;],[' >> $@
echo '])' >> $@
echo 'undefine([format])' >> $@
- echo 'define([IFACE],$(APACHE_IFACE))' >> $@
- echo 'define([GUILE_BINDIR],$(GUILE_BINDIR))' >> $@
- echo 'define([GUILE_SITE],@GUILE_SITE@)' >> $@
- echo 'define([PACKAGE],$(PACKAGE))'>> $@
- echo 'define([PREFIX],$(prefix))' >> $@
- echo 'define([SYSCONFDIR],$(sysconfdir))' >> $@
- echo 'define([LOCALEDIR],$(datadir)/locale)' >> $@
- echo 'define([HTMLDIR],$(HTMLDIR))' >> $@
- echo 'define([VERSION],$(VERSION))' >> $@
- echo 'define([LIBDIR],$(pkglibdir))' >> $@
+ echo 'define([IFACE],[$(APACHE_IFACE)])' >> $@
+ echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@
+ echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])' >> $@
+ echo 'define([GUILE_SITE],[@GUILE_SITE@])' >> $@
+ echo 'define([PACKAGE],[$(PACKAGE)])'>> $@
+ echo 'define([PREFIX],[$(prefix)])' >> $@
+ echo 'define([SYSCONFDIR],[$(sysconfdir)])' >> $@
+ echo 'define([LOCALEDIR],[$(datadir)/locale])' >> $@
+ echo 'define([HTMLDIR],[$(HTMLDIR)])' >> $@
+ echo 'define([VERSION],[$(VERSION)])' >> $@
+ echo 'define([LIBDIR],[$(pkglibdir)])' >> $@
echo 'divert(0)dnl' >> $@
echo '@AUTOGENERATED@' >> $@
diff --git a/src/ellinika/cgi.scm4 b/src/ellinika/cgi.scm4
index d1b4a5c..8c9b54d 100644
--- a/src/ellinika/cgi.scm4
+++ b/src/ellinika/cgi.scm4
@@ -109,6 +109,11 @@ ifelse(IFACE,[CGI],,dnl
arglist
(cons "?" arglist))))))
+(define-public (cgi-program-name prog)
+ (string-append
+ (substring cgi-script-name 0 (string-rindex cgi-script-name #\/)) "/"
+ prog ".SCRIPT_SUFFIX"))
+
(define-public (expand-template explist template)
"(expand-template EXPLIST TEMPLATE)

Return to:

Send suggestions and report system problems to the System administrator.