Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -238,26 +238,30 @@
 # directory.
 #========================================================================
 
 install-doc-html: doc
 	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(pkglibdir)/html"
-	@list='$(srcdir)/doc/*.html'; for i in $$list; do \
+	@list='doc/*.html'; for i in $$list; do \
 	    if test -f $$i ; then \
 		echo "Installing $$i"; \
 		$(INSTALL_DATA) $$i "$(DESTDIR)$(pkglibdir)/html"; \
 	    fi; \
 	done
 
 install-doc-n: doc
 	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(mandir)/mann"
 	@echo "Installing documentation in $(DESTDIR)$(mandir)"
-	@list='$(srcdir)/doc/*.n'; for i in $$list; do \
+	@list='doc/*.n'; for i in $$list; do \
 	    if test -f $$i ; then \
 		echo "Installing $$i"; \
 		$(INSTALL_DATA) $$i "$(DESTDIR)$(mandir)/mann" ; \
 	    fi; \
 	done
+
+#========================================================================
+# Test and debug
+#========================================================================
 
 test: binaries libraries
 	$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \
 	    -load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
 		[list load `@CYGPATH@ $(PKG_LIB_FILE)` [string totitle $(PACKAGE_NAME)]]"
@@ -301,10 +305,36 @@
 
 $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
 	-rm -f $(PKG_STUB_LIB_FILE)
 	${MAKE_STUB_LIB}
 	$(RANLIB_STUB) $(PKG_STUB_LIB_FILE)
+
+#========================================================================
+# Support files needed to compile C code
+#========================================================================
+
+# Create a C-source-ified version of the script resources for this
+# package so that we only need a single file to enable this extension.
+# I would prefer to use $< over $?, but FreeBSD's can't handle it, and
+# with only one prereq, $? is sufficient.
+tls.tcl.h: library/tls.tcl
+	sed -e '/^\\s*\#/d' -e '/^\\s*$$/d' -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/^/"/' \
+	    -e 's/$$/\\n\"/' '$?' > '$@' || { rm -f $@; exit 1; }
+
+# Create header file with fossil, git, or svn UUID for build-info command 
+manifest.uuid:
+	@echo "Make manifest.uuid"
+	printf "git-" >manifest.uuid
+	(git rev-parse HEAD >>manifest.uuid || \
+	    (printf "svn-r" >manifest.uuid ; \
+	    svn info --show-item last-changed-revision >>manifest.uuid) || \
+	    printf "unknown" >manifest.uuid)
+
+tlsUuid.h:	manifest.uuid
+	echo "#define TLS_VERSION_UUID \\" >$@
+	cat manifest.uuid >>$@
+	echo "" >>$@
 
 #========================================================================
 # We need to enumerate the list of .c to .o lines here.
 #
 # In the following lines, $(srcdir) refers to the toplevel directory
@@ -319,28 +349,10 @@
 # As necessary, add $(srcdir):$(srcdir)/compat:....
 #========================================================================
 
 VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macosx
 
-# 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)/library/tls.tcl
-	sed -e '/^\\s*\#/d' -e '/^\\s*$$/d' -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/^/"/' -e 's/$$/\\n\"/' < `@CYGPATH@ $<` > $@ || { rm -f $@; exit 1; }
-
-$(srcdir)/manifest.uuid:
-	printf "git-" >$(srcdir)/manifest.uuid
-	(cd $(srcdir); git rev-parse HEAD >>$(srcdir)/manifest.uuid || \
-	    (printf "svn-r" >$(srcdir)/manifest.uuid ; \
-	    svn info --show-item last-changed-revision >>$(srcdir)/manifest.uuid) || \
-	    printf "unknown" >$(srcdir)/manifest.uuid)
-
-tlsUuid.h:	$(srcdir)/manifest.uuid
-	echo "#define TLS_VERSION_UUID \\" >$@
-	cat $(srcdir)/manifest.uuid >>$@
-	echo "" >>$@
-
 tls.@OBJEXT@:	tlsUuid.h tls.tcl.h
 
 .c.@OBJEXT@:
 	$(COMPILE) -c `@CYGPATH@ $<` -o $@
 
@@ -350,11 +362,11 @@
 # you may find that you need to customize the package.  If so, either
 # modify the -hand version, or create a pkgIndex.tcl.in file and have
 # the configure script output the pkgIndex.tcl by editing configure.in.
 #========================================================================
 
-pkgIndex.tcl: $(srcdir)/pkgIndex.tcl.in
+pkgIndex.tcl: pkgIndex.tcl.in
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 #========================================================================
 # Distribution creation
@@ -371,11 +383,11 @@
 DIST_INSTALL_SCRIPT	= CPPROG='cp -p' $(INSTALL) -m 755
 
 dist-clean:
 	rm -rf $(DIST_DIR) $(top_builddir)/$(PKG_DIR).tar.*
 
-dist: dist-clean $(srcdir)/manifest.uuid
+dist: dist-clean manifest.uuid
 	# TEA files
 	$(INSTALL_DATA_DIR) $(DIST_DIR)
 	$(DIST_INSTALL_DATA) $(srcdir)/Makefile.in \
 		$(srcdir)/acinclude.m4 $(srcdir)/aclocal.m4 \
 		$(srcdir)/configure.ac $(DIST_DIR)/