From 2a7c58ca02cb244ee9f29e34f8cab3213a358c72 Mon Sep 17 00:00:00 2001
From: Andrey Kiselev <dron@ak4719.spb.edu>
Date: Sun, 30 Jan 2005 12:08:03 +0000
Subject: [PATCH] Fixes for --with-docdir option as per bug
 http://bugzilla.remotesensing.org/show_bug.cgi?id=759

---
 ChangeLog                     | 14 ++++++++++++++
 configure                     |  2 +-
 configure.ac                  |  2 +-
 contrib/dbs/xtiff/Makefile.in |  2 +-
 html/Makefile.in              |  2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23169425..e6943e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-01-30  Andrey Kiselev  <dron@remotesensing.org>
+
+	* configure.ac: Fixes for --with-docdir option as per bug
+
+	http://bugzilla.remotesensing.org/show_bug.cgi?id=759
+
+	* libtiff/tif_open.c: Remove unnesessary TIFFSeekFile() call as per
+	bug
+
+	http://bugzilla.remotesensing.org/show_bug.cgi?id=756
+
+	* libtiff/tif_stream.cxx: Fixes for C++ stream interface from
+	Michael Rinne and Edward Lam.
+
 2005-01-15  Andrey Kiselev  <dron@remotesensing.org>
 
 	* configure.ac: Make the documentation directory location configurable
diff --git a/configure b/configure
index 9d099476..a49faf99 100755
--- a/configure
+++ b/configure
@@ -23031,7 +23031,7 @@ fi
 
 
 
-LIBTIFF_DOCDIR=${ac_default_prefix}/share/doc/${PACKAGE}-${LIBTIFF_VERSION}
+LIBTIFF_DOCDIR=\${prefix}/share/doc/${PACKAGE}-${LIBTIFF_VERSION}
 
 
 # Check whether --with-docdir or --without-docdir was given.
diff --git a/configure.ac b/configure.ac
index e3e48de2..74dc8be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,7 @@ dnl ---------------------------------------------------------------------------
 dnl Point to path where we should install documentation.
 dnl ---------------------------------------------------------------------------
 
-LIBTIFF_DOCDIR=${ac_default_prefix}/share/doc/${PACKAGE}-${LIBTIFF_VERSION}
+LIBTIFF_DOCDIR=\${prefix}/share/doc/${PACKAGE}-${LIBTIFF_VERSION}
 
 AC_ARG_WITH(docdir,
 	    AS_HELP_STRING([--with-docdir=DIR],
diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in
index 7dbb4828..6e4b397c 100644
--- a/contrib/dbs/xtiff/Makefile.in
+++ b/contrib/dbs/xtiff/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.17 2005-01-23 09:43:26 dron Exp $
+# $Id: Makefile.in,v 1.18 2005-01-30 12:08:03 dron Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
diff --git a/html/Makefile.in b/html/Makefile.in
index f33da28d..b623eedf 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.31 2005-01-23 09:43:26 dron Exp $
+# $Id: Makefile.in,v 1.32 2005-01-30 12:08:03 dron Exp $
 #
 # Tag Image File Format (TIFF) Software
 #