diff -pburN -x 'CVS*' tpm-tools-1.3.1.vanilla/man/man1/Makefile.in tpm-tools-1.3.1/man/man1/Makefile.in
--- tpm-tools-1.3.1.vanilla/man/man1/Makefile.in	2007-11-21 14:20:17.000000000 -0600
+++ tpm-tools-1.3.1/man/man1/Makefile.in	2007-12-13 13:00:50.000000000 -0600
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -59,6 +59,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+@P11_SUPPORT_TRUE@am__append_1 = tpmtoken_init.1		\
+@P11_SUPPORT_TRUE@			tpmtoken_import.1	\
+@P11_SUPPORT_TRUE@			tpmtoken_objects.1	\
+@P11_SUPPORT_TRUE@			tpmtoken_protect.1	\
+@P11_SUPPORT_TRUE@			tpmtoken_setpasswd.1
+
 subdir = man/man1
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -110,6 +116,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
@@ -139,6 +146,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 RM = @RM@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -194,14 +202,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-man1_MANS = tpm_sealdata.1		\
-			tpm_version.1		\
-			tpmtoken_init.1		\
-			tpmtoken_import.1	\
-			tpmtoken_objects.1	\
-			tpmtoken_protect.1	\
-			tpmtoken_setpasswd.1
-
+man1_MANS = tpm_sealdata.1 tpm_version.1 $(am__append_1)
 EXTRA_DIST = $(man1_MANS)
 all: all-am