--- tclgpgme-1.0.org/configure.in	2002-09-25 22:49:42.000000000 +0300
+++ tclgpgme-1.0.org/configure.in	2007-12-08 13:04:41.000000000 +0200
@@ -12,8 +12,9 @@ 
 # AC_INIT(../generic/tcl.h)
 #--------------------------------------------------------------------
 
-AC_INIT(tclgpgme.c)
+AC_INIT(tclgpgme.c,1.0)
 AC_CONFIG_AUX_DIR(config)
+AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
 CONFIGDIR=${srcdir}/config
 AC_SUBST(CONFIGDIR)
 AC_PROG_CC
@@ -273,7 +274,7 @@ AC_SUBST(SHLIB_LD_LIBS)
 
 SC_PROG_TCLSH
 
-PKG_TCL=${TCL_PACKAGE_PATH}/gpgme-${VERSION}
+PKG_TCL=${TCL_PACKAGE_PATH%% *}/gpgme-${VERSION}
 AC_SUBST(PKG_TCL)
 
 #--------------------------------------------------------------------
--- tclgpgme-1.0.org/Makefile.am	2002-08-30 09:48:32.000000000 +0300
+++ tclgpgme-1.0.org/Makefile.am	2007-12-08 13:01:27.000000000 +0200
@@ -1,7 +1,7 @@ 
 # Makefile.am for the Tcl gpgme extension
 # 
 
-LIB_TCL		= @TCL_LIB_SPEC@ @GPGME_LIBS@
+LIB_TCL		= @TCL_STUB_LIB_SPEC@ @GPGME_LIBS@
 
 tclgpgme_version = 1:0:0
 
@@ -17,11 +17,11 @@ libtclgpgme_la_DEPENDENCIES = 
 libtclgpgme_la_LIBADD = $(LIB_TCL)
 
 install-exec-hook:
-	$(mkinstalldirs) @PKG_TCL@
+	$(mkinstalldirs) $(DESTDIR)@PKG_TCL@
 	echo	"package ifneeded gpgme"				   \
 		`echo $(VERSION) | awk -F. '{ printf "%s.%s", $$1, $$2 }'` \
-		"[list load $(DESTDIR)$(libdir)/libtclgpgme.so]"	   \
-	    > @PKG_TCL@/pkgIndex.tcl
+		"[list load $(libdir)/libtclgpgme.so]"	   \
+	    > $(DESTDIR)@PKG_TCL@/pkgIndex.tcl
 	sed -e 's%load .libs/libtclgpgme.so%package require gpgme%' \
 	    < test.tcl						    \
-	    > @PKG_TCL@/test.tcl
+	    > $(DESTDIR)@PKG_TCL@/test.tcl