Index: build/autogen.sh
==================================================================
--- build/autogen.sh
+++ build/autogen.sh
@@ -1,7 +1,13 @@
 #! /bin/bash
+
+if [ -n "${VERS}" ]; then
+	sed "s|@@VERS@@|${VERS}|g" configure.ac > configure.ac.new
+	cat configure.ac.new > configure.ac
+	rm -f configure.ac.new
+fi
 
 cat aclocal/*.m4 > aclocal.m4 || exit 1
 autoconf || exit 1
 rm -rf autom4te.cache/
 
 exit 0

Index: build/makearch.info
==================================================================
--- build/makearch.info
+++ build/makearch.info
@@ -31,13 +31,16 @@
 # tacked onto them.
 UPDATE_VARS="configure.ac"
 
 # This script is executed immediately after copying the files
 # to a temp directory to attempt to compile
-BEFORE="build/autogen.sh"
+BEFORE=""
+
+# This script is executed after updating variables
+UPDATED="build/autogen.sh"
 
 # This script is executed immediately prior to creation of the
 # tarball
 AFTER=""
 
 # Files matching these (space-seperated) patterns are deleted
 TMPS="*.out HEADER build"

DELETED ctk.tcl
Index: ctk.tcl
==================================================================
--- ctk.tcl
+++ ctk.tcl
@@ -1,31 +0,0 @@
-#! /usr/bin/env tclsh
-
-load ./libctk.so Tk
-
-namespace eval ::pkcs11_getfile {}
-unset -nocomplain ::pkcs11_getfile::pkcs11file
-
-# Curses Tk lacks a "tk_getOpenFile" dialog, we create a simple input dialog
-toplevel .pkcs11_getfile
-label .pkcs11_getfile.lblInput -text "Please enter the pathname to a working PKCS#11 Module"
-entry .pkcs11_getfile.entInput
-button .pkcs11_getfile.btnOK -text "OK" -command {
-	set ::pkcs11_getfile::pkcs11file [.pkcs11_getfile.entInput get]
-
-	destroy .pkcs11_getfile
-}
-button .pkcs11_getfile.btnCancel -text "Cancel" -command {
-	destroy .pkcs11_getfile
-
-	set ::pkcs11_getfile::pkcs11file ""
-}
-
-pack .pkcs11_getfile.lblInput
-pack .pkcs11_getfile.entInput
-pack .pkcs11_getfile.btnOK .pkcs11_getfile.btnCancel
-
-focus .pkcs11_getfile.entInput
-
-tkwait variable ::pkcs11_getfile::pkcs11file
-set pkcs11file $::pkcs11_getfile::pkcs11file
-