3 files changed, 17 insertions, 14 deletions
diff --git a/src/cgi-bin/.gitignore b/src/cgi-bin/.gitignore
index a2d76a3..21128b6 100644
--- a/src/cgi-bin/.gitignore
+++ b/src/cgi-bin/.gitignore
@@ -1,7 +1,5 @@
-dict.cgi
 dict.m4
 dict.scm
 dict.sed
-nea.cgi
 nea.scm
 conj.scm
diff --git a/src/cgi-bin/Makefile.am b/src/cgi-bin/Makefile.am
index f085e57..aca9137 100644
--- a/src/cgi-bin/Makefile.am
+++ b/src/cgi-bin/Makefile.am
@@ -14,10 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-cgidir=@CGIDIR@
-cgi_SCRIPTS=$(EXTRA_DIST:.scm4=.@SCRIPT_SUFFIX@)
-EXTRA_DIST=dict.scm4 nea.scm4 conj.scm4
-CLEANFILES=dict.m4 dict.scm nea.scm dict.cgi nea.cgi conj.cgi
+cgidir      = @CGIDIR@
+CGI_SOURCES = dict.scm4 nea.scm4 conj.scm4
+EXTRA_DIST  = $(CGI_SOURCES)
+cgi_SCRIPTS = $(CGI_SOURCES:.scm4=.scm)
+CLEANFILES  = dict.m4 $(cgi_SCRIPTS)
 
 dict.m4: Makefile
 	$(AM_V_GEN){							\
@@ -43,18 +44,22 @@ dict.m4: Makefile
 		echo ')dnl';						\
 	} > dict.m4
 
-SUFFIXES = .scm4 .scm .cgi
+SUFFIXES = .scm4 .scm
 
 .scm4.scm:
 	$(AM_V_GEN)m4 dict.m4 $< > $@ 
 
-.scm.cgi:
-	$(AM_V_GEN)cp $< $@
-
 dict.scm: dict.scm4 dict.m4
 nea.scm: nea.scm4 dict.m4
 conj.scm: conj.scm4 dict.m4
 
-dict.cgi: dict.scm
-nea.cgi: nea.scm
-conj.cgi: conj.scm
+install-data-hook:
+	$(AM_V_GEN)if test @REAL_SCRIPT_SUFFIX@ != .scm; then\
+          here=`pwd`; \
+          cd $(DESTDIR)$(cgidir); \
+          for file in $(cgi_SCRIPTS); do\
+	    mv $$file $${file%%.scm}@REAL_SCRIPT_SUFFIX@;\
+          done;\
+          cd $$here;\
+        fi
+
diff --git a/src/ellinika/cgi.scm4 b/src/ellinika/cgi.scm4
index 51f9570..28adea1 100644
--- a/src/ellinika/cgi.scm4
+++ b/src/ellinika/cgi.scm4
@@ -127,7 +127,7 @@ ifelse(IFACE,[CGI],[
 (define-public (cgi-program-name prog)
   (string-append
    (substring cgi-script-name 0 (string-rindex cgi-script-name #\/)) "/"
-   prog ".SCRIPT_SUFFIX"))
+   prog ifelse(SCRIPT_SUFFIX,,,"SCRIPT_SUFFIX")))
 
 (define-public (expand-template explist template)
   "(expand-template EXPLIST TEMPLATE)