diff options
Diffstat (limited to 'src/ellinika')
-rw-r--r-- | src/ellinika/Makefile.am | 21 | ||||
-rw-r--r-- | src/ellinika/cgi.scm4 | 5 |
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) |