Index: tdbc/Makefile.in
==================================================================
--- tdbc/Makefile.in
+++ tdbc/Makefile.in
@@ -191,10 +191,11 @@
 # The list of targets to build for "binaries:" is specified at the top
 # of the Makefile, in the "BINARIES" variable.
 #========================================================================
 
 binaries: $(BINARIES)
+	cp -p $(srcdir)/library/tdbc.tcl $(top_builddir)
 
 libraries:
 
 #========================================================================
 # Your doc target should differentiate from doc builds (by the developer)
@@ -384,10 +385,11 @@
 
 clean:  
 	-test -z "$(BINARIES)" || rm -f $(BINARIES)
 	-rm -f *.$(OBJEXT) core *.core
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-rm -f tdbc.tcl
 
 distclean: clean
 	-rm -f *.tab.c
 	-rm -f $(CONFIGURE_OUTPUTS)
 

Index: tdbcpostgres/Makefile.in
==================================================================
--- tdbcpostgres/Makefile.in
+++ tdbcpostgres/Makefile.in
@@ -223,15 +223,16 @@
 #========================================================================
 
 install-doc: doc
 	@$(INSTALL_DATA_DIR) $(DESTDIR)$(mandir)/mann
 	@echo "Installing documentation in $(DESTDIR)$(mandir)"
-	@list='$(srcdir)/doc/*.n'; for i in $$list; do \
-	    echo "Installing $$i"; \
-	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
-	done
+#   Not written yet!
+#	@list='$(srcdir)/doc/*.n'; for i in $$list; do \
+#	    echo "Installing $$i"; \
+#	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
+#	    $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
+#	done
 
 test: binaries libraries
 	$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \
 		-load "package ifneeded tdbc::postgres $(PACKAGE_VERSION) \
 			[list source `@CYGPATH@ $(srcdir)/library/tdbcpostgres.tcl`]\;[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]"
@@ -316,17 +317,19 @@
 #   Not written yet!
 #	mkdir $(DIST_DIR)/doc
 #	cp -p $(srcdir)/doc/tdbc_postgres.n $(DIST_DIR)/doc/
 
 	mkdir $(DIST_DIR)/generic
-	cp -p $(srcdir)/generic/tdbcpostgres.c $(DIST_DIR)/generic/
+	cp -p $(srcdir)/generic/fakepq.h $(srcdir)/generic/pqStubDefs.txt \
+		$(srcdir)/generic/pqStubInit.c $(srcdir)/generic/pqStubs.h \
+		$(srcdir)/generic/tdbcpostgres.c $(DIST_DIR)/generic/
 
 	mkdir $(DIST_DIR)/library
 	cp -p $(srcdir)/library/tdbcpostgres.tcl $(DIST_DIR)/library/
 
 	mkdir $(DIST_DIR)/tests
-	cp -p $(srcdir)/tests/all.tcl $(srcdir)/tests/postgres.test \
+	cp -p $(srcdir)/tests/all.tcl $(srcdir)/tests/tdbcpostgres.test \
 		$(DIST_DIR)/tests/
 
 	(cd $(DIST_ROOT); $(COMPRESS);)
 
 #========================================================================

Index: tdbcsqlite3/Makefile.in
==================================================================
--- tdbcsqlite3/Makefile.in
+++ tdbcsqlite3/Makefile.in
@@ -66,11 +66,11 @@
 datadir		= @datadir@
 mandir		= @mandir@
 
 DESTDIR		=
 
-PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
+PKG_DIR		= $(PACKAGE_NAME)-$(PACKAGE_VERSION)
 pkgdatadir	= $(datadir)/$(PKG_DIR)
 pkglibdir	= $(libdir)/$(PKG_DIR)
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 tmdir		= $(libdir)/tcl$(TCL_MAJOR_VERSION)/$(TCL_VERSION)
 pkgslash	= `echo $(PACKAGE_NAME) | sed s=tdbc=tdbc/=`