*** empty log message ***

2005-01-15 17:24:52 +00:00 · 2005-01-15 17:24:52 +00:00 · c0d1f11f57
commit c0d1f11f57
parent f284d8e843
30 changed files with 116 additions and 38 deletions
--- a/20
+++ b/20
@ -1,3 +1,23 @@
+2005-01-15  Andrey Kiselev  <dron@remotesensing.org>
+
+	* configure.ac: Make the documentation directory location configurable
+	via the --with-docdir option (as suggested by Jeremy C. Reed).
+
+	* libtiff/tif_color.c: Use double as the second argument of pow()
+	function in TIFFCIELabToRGBInit(). As per bug
+
+	http://bugzilla.remotesensing.org/show_bug.cgi?id=741
+
+	* libtiff/tif_pixarlog.c: Avoid warnings when converting float to
+	integer as per bug
+
+	http://bugzilla.remotesensing.org/show_bug.cgi?id=740
+
+	* libtiff/tif_getimage.c: Always fill the error message buffer in
+	TIFFRGBAImageBegin() as per bug
+
+	http://bugzilla.remotesensing.org/show_bug.cgi?id=739
+	
 2005-01-12  Andrey Kiselev  <dron@remotesensing.org>

 	* libtiff/tif_jpeg.c: Added ability to read/write the fax specific
--- a/Makefile.am
+++ b/Makefile.am
@ -23,7 +23,7 @@

 # Process this file with automake to produce Makefile.in.

-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+docdir = $(LIBTIFF_DOCDIR)

 AUTOMAKE_OPTIONS = dist-zip foreign

--- a/Makefile.in
+++ b/Makefile.in
@ -156,6 +156,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
@ -236,7 +237,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+docdir = $(LIBTIFF_DOCDIR)
 AUTOMAKE_OPTIONS = dist-zip foreign
 docfiles = \
 	COPYRIGHT \
--- a/76
+++ b/76
@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_ALPHA_VERSION LIBTIFF_VERSION LIBTIFF_RELEASE_DATE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HAVE_CXX_TRUE HAVE_CXX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS GL_CFLAGS GL_LIBS GLU_CFLAGS GLU_LIBS GLUT_CFLAGS GLUT_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_ALPHA_VERSION LIBTIFF_VERSION LIBTIFF_RELEASE_DATE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LIBTIFF_DOCDIR HAVE_CXX_TRUE HAVE_CXX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS GL_CFLAGS GL_LIBS GLU_CFLAGS GLU_LIBS GLUT_CFLAGS GLUT_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE LTLIBOBJS'
 ac_subst_files=''

 # Initialize some variables set by options.
@ -1083,6 +1083,7 @@ Optional Packages:
                          both]
  --with-tags[=TAGS]
                          include additional configurations [automatic]
+  --with-docdir=DIR       directory where documentation should be installed
  --with-zlib-include-dir=DIR
                          location of Zlib headers
  --with-zlib-lib-dir=DIR location of Zlib library binary
@ -4782,7 +4783,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 4785 "configure"' > conftest.$ac_ext
+  echo '#line 4786 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -6346,7 +6347,7 @@ fi


 # Provide some information about the compiler.
-echo "$as_me:6349:" \
+echo "$as_me:6350:" \
     "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@ -7382,11 +7383,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7385: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7386: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7389: \$? = $ac_status" >&5
+   echo "$as_me:7390: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -7615,11 +7616,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7618: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7619: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7622: \$? = $ac_status" >&5
+   echo "$as_me:7623: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -7675,11 +7676,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7678: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7679: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7682: \$? = $ac_status" >&5
+   echo "$as_me:7683: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -9863,7 +9864,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 9866 "configure"
+#line 9867 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -9961,7 +9962,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 9964 "configure"
+#line 9965 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -12142,11 +12143,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12145: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12146: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:12149: \$? = $ac_status" >&5
+   echo "$as_me:12150: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -12202,11 +12203,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12205: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12206: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:12209: \$? = $ac_status" >&5
+   echo "$as_me:12210: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -13571,7 +13572,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 13574 "configure"
+#line 13575 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -13669,7 +13670,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 13672 "configure"
+#line 13673 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -14496,11 +14497,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14499: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14500: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:14503: \$? = $ac_status" >&5
+   echo "$as_me:14504: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -14556,11 +14557,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14559: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14560: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:14563: \$? = $ac_status" >&5
+   echo "$as_me:14564: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -16605,11 +16606,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16608: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16609: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:16612: \$? = $ac_status" >&5
+   echo "$as_me:16613: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -16838,11 +16839,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16841: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16842: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:16845: \$? = $ac_status" >&5
+   echo "$as_me:16846: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@ -16898,11 +16899,11 @@ else
   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16901: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16902: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:16905: \$? = $ac_status" >&5
+   echo "$as_me:16906: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@ -19086,7 +19087,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 19089 "configure"
+#line 19090 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -19184,7 +19185,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 19187 "configure"
+#line 19188 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -23030,6 +23031,21 @@ fi



+LIBTIFF_DOCDIR=${ac_default_prefix}/share/doc/${PACKAGE}-${LIBTIFF_VERSION}/html
+
+
+# Check whether --with-docdir or --without-docdir was given.
+if test "${with_docdir+set}" = set; then
+  withval="$with_docdir"
+
+fi;
+if test "x$with_docdir" != "x" ; then
+  LIBTIFF_DOCDIR=$with_docdir
+fi
+
+
+
+
 # Check whether --enable-ccitt or --disable-ccitt was given.
 if test "${enable_ccitt+set}" = set; then
  enableval="$enable_ccitt"
@ -26962,6 +26978,7 @@ s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LIBTIFF_DOCDIR@,$LIBTIFF_DOCDIR,;t t
 s,@HAVE_CXX_TRUE@,$HAVE_CXX_TRUE,;t t
 s,@HAVE_CXX_FALSE@,$HAVE_CXX_FALSE,;t t
 s,@X_CFLAGS@,$X_CFLAGS,;t t
@ -27703,6 +27720,7 @@ echo ""
 echo "Libtiff is now configured for ${host}"
 echo ""
 echo "  Installation directory:            ${prefix}"
+echo "  Documentation directory:           ${LIBTIFF_DOCDIR}"
 echo "  C compiler:                        ${CC} ${CFLAGS}"
 echo "  C++ compiler:                      ${CXX} ${CXXFLAGS}"
 echo "  Enable runtime linker paths:       ${HAVE_RPATH}"
--- a/configure.ac
+++ b/configure.ac
@ -158,6 +158,21 @@ dnl ---------------------------------------------------------------------------

 AC_SYS_LARGEFILE

+dnl ---------------------------------------------------------------------------
+dnl Point to path where we should install documentation.
+dnl ---------------------------------------------------------------------------
+
+LIBTIFF_DOCDIR=${ac_default_prefix}/share/doc/${PACKAGE}-${LIBTIFF_VERSION}/html
+
+AC_ARG_WITH(docdir,
+	    AS_HELP_STRING([--with-docdir=DIR],
+			   [directory where documentation should be installed]),,)
+if test "x$with_docdir" != "x" ; then
+  LIBTIFF_DOCDIR=$with_docdir
+fi
+ 
+AC_SUBST(LIBTIFF_DOCDIR)
+
 dnl ---------------------------------------------------------------------------
 dnl Switch on/off internal codecs.
 dnl ---------------------------------------------------------------------------
@ -479,6 +494,7 @@ LOC_MSG()
 LOC_MSG([Libtiff is now configured for ${host}])
 LOC_MSG()
 LOC_MSG([  Installation directory:            ${prefix}])
+LOC_MSG([  Documentation directory:           ${LIBTIFF_DOCDIR}])
 LOC_MSG([  C compiler:                        ${CC} ${CFLAGS}])
 LOC_MSG([  C++ compiler:                      ${CXX} ${CXXFLAGS}])
 LOC_MSG([  Enable runtime linker paths:       ${HAVE_RPATH}])
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@ -131,6 +131,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/acorn/Makefile.in
+++ b/contrib/acorn/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/addtiffo/Makefile.in
+++ b/contrib/addtiffo/Makefile.in
@ -145,6 +145,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/dbs/Makefile.in
+++ b/contrib/dbs/Makefile.in
@ -163,6 +163,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/dbs/xtiff/Makefile.in
+++ b/contrib/dbs/xtiff/Makefile.in
@ -14,7 +14,7 @@

@SET_MAKE@

-# $Id: Makefile.in,v 1.15 2005-01-11 15:07:06 dron Exp $
+# $Id: Makefile.in,v 1.16 2005-01-15 17:24:53 dron Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
@ -124,6 +124,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/iptcutil/Makefile.in
+++ b/contrib/iptcutil/Makefile.in
@ -144,6 +144,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/mac-cw/Makefile.in
+++ b/contrib/mac-cw/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/mac-mpw/Makefile.in
+++ b/contrib/mac-mpw/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/mfs/Makefile.in
+++ b/contrib/mfs/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/ojpeg/Makefile.in
+++ b/contrib/ojpeg/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/pds/Makefile.in
+++ b/contrib/pds/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/ras/Makefile.in
+++ b/contrib/ras/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/stream/Makefile.in
+++ b/contrib/stream/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/tags/Makefile.in
+++ b/contrib/tags/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/contrib/win_dib/Makefile.in
+++ b/contrib/win_dib/Makefile.in
@ -122,6 +122,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/html/Makefile.am
+++ b/html/Makefile.am
@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.9 2004-12-20 19:31:44 dron Exp $
+# $Id: Makefile.am,v 1.10 2005-01-15 17:24:53 dron Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
@ -25,7 +25,7 @@

 # Process this file with automake to produce Makefile.in.

-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/html
+docdir = $(LIBTIFF_DOCDIR)

 docfiles = \
 	addingtags.html \
--- a/html/Makefile.in
+++ b/html/Makefile.in
@ -14,7 +14,7 @@

@SET_MAKE@

-# $Id: Makefile.in,v 1.29 2005-01-11 15:07:06 dron Exp $
+# $Id: Makefile.in,v 1.30 2005-01-15 17:24:53 dron Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
@ -144,6 +144,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
@ -224,7 +225,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/html
+docdir = $(LIBTIFF_DOCDIR)
 docfiles = \
 	addingtags.html \
 	bugs.html \
--- a/html/images/Makefile.in
+++ b/html/images/Makefile.in
@ -133,6 +133,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/html/man/Makefile.am
+++ b/html/man/Makefile.am
@ -23,7 +23,7 @@

 # Process this file with automake to produce Makefile.in.

-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/html/man
+docdir = $(LIBTIFF_DOCDIR)

 docfiles = \
 	fax2ps.1.html \
--- a/html/man/Makefile.in
+++ b/html/man/Makefile.in
@ -133,6 +133,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
@ -213,7 +214,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)/html/man
+docdir = $(LIBTIFF_DOCDIR)
 docfiles = \
 	fax2ps.1.html \
 	fax2ps.1.html \
--- a/libtiff/Makefile.in
+++ b/libtiff/Makefile.in
@ -190,6 +190,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/man/Makefile.in
+++ b/man/Makefile.in
@ -127,6 +127,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/port/Makefile.in
+++ b/port/Makefile.in
@ -143,6 +143,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/test/Makefile.in
+++ b/test/Makefile.in
@ -155,6 +155,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@ -252,6 +252,7 @@ LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
+LIBTIFF_DOCDIR = @LIBTIFF_DOCDIR@
 LIBTIFF_MAJOR_VERSION = @LIBTIFF_MAJOR_VERSION@
 LIBTIFF_MICRO_VERSION = @LIBTIFF_MICRO_VERSION@
 LIBTIFF_MINOR_VERSION = @LIBTIFF_MINOR_VERSION@