Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -3,17 +3,19 @@
 RANLIB = @RANLIB@
 CFLAGS = @CFLAGS@ @SHOBJFLAGS@
 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)
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 VPATH = @srcdir@
 
 all: @EXTENSION_TARGET@
 
 # The shared object target
@@ -52,11 +54,18 @@
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o "$@" -c "$<"
 
 # Install the extension
 install: @EXTENSION_TARGET@ pkgIndex.tcl
 	$(INSTALL) -d '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
-	$(INSTALL) -c @EXTENSION_TARGET@ pkgIndex.tcl '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
+	$(INSTALL_PROGRAM) @EXTENSION_TARGET@ '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
+	$(INSTALL_DATA)    pkgIndex.tcl '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
+
+# A convienent helper to undo the installation just done
+uninstall:
+	rm -f '$(DESTDIR)$(PACKAGE_INSTALL_DIR)/@EXTENSION_TARGET@'
+	rm -f '$(DESTDIR)$(PACKAGE_INSTALL_DIR)/pkgIndex.tcl'
+	-rmdir '$(DESTDIR)$(PACKAGE_INSTALL_DIR)'
 
 # Test target, run the automated test suite
 test: @EXTENSION_TARGET@
 	@TCLSH_PROG@ @srcdir@/tests/all.tcl $(TESTFLAGS) -load "lappend auto_path $(shell pwd)"
 
@@ -83,6 +92,6 @@
 	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
+.PHONY: all install uninstall clean distclean mrproper test