Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -1,26 +1,32 @@
 CC            := @CC@
+AR            := @AR@
+RANLIB        := @RANLIB@
 CFLAGS        := @CFLAGS@ @SHOBJFLAGS@
 CPPFLAGS      := -I. -I@srcdir@/tweetnacl/ -I@srcdir@/blake2b/ -DNACL_ED25519_BLAKE2B=1 @CPPFLAGS@ @SHOBJCPPFLAGS@ @DEFS@
 LDFLAGS       := @LDFLAGS@
 LIBS          := @LIBS@
 SHOBJLDFLAGS  := @SHOBJLDFLAGS@
 srcdir        := @srcdir@
 export CC CFLAGS CPPFLAGS
 
-all: @EXTENSION_TARGET@
+all: @EXTENSION_TARGET@ pkgIndex.tcl
 
-ifeq (@TCLEXT_BUILD@,shared)
 @EXTENSION_TARGET@: tweetnacl.o blake2b.o nano.o Makefile
+ifeq (@TCLEXT_BUILD@,shared)
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o @EXTENSION_TARGET@ nano.o tweetnacl.o blake2b.o $(LIBS)
 	-@WEAKENSYMS@ @EXTENSION_TARGET@
 	-@REMOVESYMS@ @EXTENSION_TARGET@
 else
-@EXTENSION_TARGET@: tweetnacl.o blake2b.o nano.o Makefile
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o @EXTENSION_TARGET@ nano.o tweetnacl.o blake2b.o $(LIBS)
+	rm -f @EXTENSION_TARGET@
+	$(AR) rc @EXTENSION_TARGET@ nano.o blake2b.o tweetnacl.o
+	-$(RANLIB) @EXTENSION_TARGET@
 endif
 
+pkgIndex.tcl: pkgIndex.tcl-@TCLEXT_BUILD@
+	cp pkgIndex.tcl-@TCLEXT_BUILD@ pkgIndex.tcl
+
 nano.o: @srcdir@/nano.c @srcdir@/tweetnacl/tweetnacl.h @srcdir@/blake2b/blake2.h nano.tcl.h Makefile
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o nano.o -c @srcdir@/nano.c
 
 nano.tcl.h: @srcdir@/nano.tcl Makefile
 	od -A n -v -t xC < '@srcdir@/nano.tcl' > nano.tcl.h.new.1
@@ -40,14 +46,16 @@
 clean:
 	rm -f @EXTENSION_TARGET@ nano.o
 	rm -f blake2b.o tweetnacl.o
 
 distclean: clean
-	rm -f Makefile pkgIndex.tcl config.log config.status nano.syms
-	rm -f nano.tcl.h
+	rm -f Makefile pkgIndex.tcl-shared pkgIndex.tcl-static nano.syms
+	rm -f pkgIndex.tcl
+	rm -f config.log config.status
+	rm -f nano.tcl.h nano.tcl.h.new.1 nano.tcl.h.new.2
 
 mrproper: distclean
 	rm -f configure aclocal.m4 config.guess config.sub install-sh
 	rm -rf tweetnacl blake2b
 	rm -rf build/tweetnacl/out build/blake2b/out
 
 .PHONY: all test clean distclean mrproper

Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -77,6 +77,6 @@
 	WEAKENSYMS=':'
 	REMOVESYMS=':'
 fi
 
 dnl Produce output
-AC_OUTPUT(Makefile pkgIndex.tcl nano.syms)
+AC_OUTPUT(Makefile pkgIndex.tcl-${TCLEXT_BUILD} nano.syms)

ADDED   pkgIndex.tcl-shared.in
Index: pkgIndex.tcl-shared.in
==================================================================
--- /dev/null
+++ pkgIndex.tcl-shared.in
@@ -0,0 +1,1 @@
+package ifneeded nano @PACKAGE_VERSION@ [list load [file join $dir @EXTENSION_TARGET@]]

ADDED   pkgIndex.tcl-static.in
Index: pkgIndex.tcl-static.in
==================================================================
--- /dev/null
+++ pkgIndex.tcl-static.in
@@ -0,0 +1,1 @@
+package ifneeded nano @PACKAGE_VERSION@ [list load {} Nano]

DELETED pkgIndex.tcl.in
Index: pkgIndex.tcl.in
==================================================================
--- pkgIndex.tcl.in
+++ /dev/null
@@ -1,1 +0,0 @@
-package ifneeded nano @PACKAGE_VERSION@ [list load [file join $dir nano.so]]