@@ -5,14 +5,16 @@
 CPPFLAGS = @CPPFLAGS@ -I@srcdir@ -I. @DEFS@ @TCL_DEFS@
 LDFLAGS = @LDFLAGS@ @SHOBJLDFLAGS@
 LIBS = @LIBS@
 INSTALL = @INSTALL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
 TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
 PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tcltls$(PACKAGE_VERSION)
 VPATH = @srcdir@
-srcdir = @srcdir@
 
 all: @EXTENSION_TARGET@
 
 # The shared object target
 tcltls.@SHOBJEXT@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
@@ -31,12 +33,12 @@
 tlsX509.o: @srcdir@/tlsX509.c @srcdir@/tlsInt.h Makefile
 
 # Create a C-source-ified version of the script resources
 # for TclTLS so that we only need a single file to enable
 # this extension
-tls.tcl.h: $(srcdir)/tls.tcl
-	od -A n -v -t xC < '$(srcdir)/tls.tcl' > tls.tcl.h.new.1
+tls.tcl.h: @srcdir@/tls.tcl
+	od -A n -v -t xC < '@srcdir@/tls.tcl' > tls.tcl.h.new.1
 	sed 's@  *@@g;s@..@0x&, @g' < tls.tcl.h.new.1 > tls.tcl.h.new.2
 	rm -f tls.tcl.h.new.1
 	mv tls.tcl.h.new.2 tls.tcl.h
 
 # Create default DH parameters
@@ -60,12 +62,14 @@
 
 # Clean the local build directory for rebuild against the same configuration
 clean:
 	rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o
 	rm -f tcltls.@SHOBJEXT@
+	rm -f tcltls.@SHOBJEXT@.a tcltls.@SHOBJEXT@.def
 	rm -f tcltls.a.new tcltls.a
-	rm -f tls.tcl.h tls.tcl.h.new.1 tls.tcl.h.new.2
+	rm -f tls.tcl.h.new.1 tls.tcl.h.new.2
+	@if [ '@srcdir@' != '.' ]; then echo rm -f tls.tcl.h; rm -f tls.tcl.h; fi
 
 # Clean the local build directory back to what it was after unpacking the
 # distribution tarball
 distclean: clean
 	rm -f config.log config.status
@@ -77,7 +81,8 @@
 # version control system
 mrproper: distclean
 	rm -f @srcdir@/configure @srcdir@/config.sub @srcdir@/config.guess @srcdir@/install-sh
 	rm -f @srcdir@/aclocal.m4
 	rm -rf @srcdir@/autom4te.cache
+	rm -f @srcdir@/tls.tcl.h
 
 .PHONY: all install clean distclean mrproper test