diff -ru tiff-v3.6.1/config.site tiff-v3.6.1-patched/config.site --- tiff-v3.6.1/config.site Sat Oct 12 08:52:46 2002 +++ tiff-v3.6.1-patched/config.site Mon Jan 19 21:22:56 2004 @@ -37,12 +37,15 @@ # interactive prompting done by the configure script. # +PREFIX=@PREFIX@ + + # # Package controls. # -#DSO="auto" # auto|IRIX|IRIX52 enable DSO support for system -#JPEG="yes" # yes|no configure JPEG support (see below) -#ZIP="yes" # yes|no configure Deflate support (see below) +DSO="auto" # auto|IRIX|IRIX52 enable DSO support for system +JPEG="yes" # yes|no configure JPEG support (see below) +ZIP="yes" # yes|no configure Deflate support (see below) #LIBGL="auto" # yes|no|auto configure IRIS GL-based tools #LIBIMAGE="auto" # yes|no|auto configure SGI RGB image tools #HTML="yes" # yes|no install HTML documentation @@ -52,10 +55,10 @@ # # Directory parameters. # -#DIR_BIN="/usr/local/bin" # directory for tools -#DIR_LIB="/usr/local/lib" # directory for libraries -#DIR_INC="/usr/local/include" # directory for include files -#DIR_MAN="/usr/local/man" # directory for manual pages +DIR_BIN="$PREFIX/bin" # directory for tools +DIR_LIB="$PREFIX/lib" # directory for libraries +DIR_INC="$PREFIX/include" # directory for include files +DIR_MAN="$PREFIX/share/man" # directory for manual pages #DIR_HTML="/var/httpd/htdocs/tiff" # directory for HTML documentation # @@ -97,7 +100,9 @@ # which you can find on the Internet at ftp.uu.net:/graphics/jpeg/. # #DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files +DIRS_LIBINC="$DIRS_LIBINC $PREFIX/include" #DIR_JPEGLIB=../src/jpeg-6b # directory for libjpeg +DIR_JPEGLIB="$PREFIX/lib" # The following will enable OJPEG support. Note that a patch libjpeg is # required before this can be enabled. It is also only supported if JPEG is @@ -118,7 +123,9 @@ # Look for it also at ftp://ftp.uu.net/pub/archiving/zip/zlib. # #DIRS_LIBINC="$DIRS_LIBINC ../zlib" # directory for zlib include files +DIRS_LIBINC="$DIRS_LIBINC $PREFIX/include" # directory for zlib include files #DIR_GZLIB="../zlib" # directory for libz +DIR_GZLIB="$PREFIX/lib" # directory for libz # # Miscellaneous parameters. diff -ru tiff-v3.6.1/configure tiff-v3.6.1-patched/configure --- tiff-v3.6.1/configure Tue Oct 14 07:06:21 2003 +++ tiff-v3.6.1-patched/configure Mon Jan 19 21:23:40 2004 @@ -1216,12 +1216,13 @@ esac ;; *-darwin*) - DSOSUF=dylib + DSOSUF=${DIST_MAJOR}.dylib DSOSUF_VERSION=${DIST_MAJOR}.${DIST_MINOR}.${DIST_POINT}.dylib LIBCOPTS='-fno-common' DSOLD="${CCOMPILER} ${ENVOPTS}" DSOOPTS='-dynamiclib -undefined error' DSO=DARWIN + DSOVERSTRING='-compatibility_version '${DIST_MAJOR}.${DIST_MINOR}' -current_version '${DIST_MAJOR}.${DIST_MINOR}.${DIST_POINT} ;; *-linux*) DSOSUF=so.${DIST_MAJOR} @@ -1807,6 +1808,7 @@ s;@DSO@;${DSO};g s;@DSOSUF@;${DSOSUF};g s;@DSOSUF_VERSION@;${DSOSUF_VERSION};g +s;@DSOVERSTRING@;${DSOVERSTRING};g s;@ENVOPTS@;${ENVOPTS};g s;@FILLORDER@;${FILLORDER};g s;@GCOPTS@;${GCOPTS};g diff -ru tiff-v3.6.1/libtiff/Makefile.in tiff-v3.6.1-patched/libtiff/Makefile.in --- tiff-v3.6.1/libtiff/Makefile.in Mon Nov 17 04:24:41 2003 +++ tiff-v3.6.1-patched/libtiff/Makefile.in Mon Jan 19 21:22:56 2004 @@ -217,7 +217,8 @@ touch $@ DARWINdso: ${OBJS} ${CC} -dynamiclib -undefined error \ - -install_name libtiff.@DSOSUF@ \ + -install_name @DIR_LIB@/libtiff.@DSOSUF@ \ + @DSOVERSTRING@ \ -o libtiff.@DSOSUF_VERSION@ ${OBJS} \ @LIBJPEG@ @LIBGZ@ @MACHDEPLIBS@ rm -f libtiff.@DSOSUF@ @@ -390,7 +391,7 @@ ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@ \ -lns libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ ${INSTALL} -idb tiff.sw.tools -F ${DESTDIR}@DIR_LIB@ \ - -lns libtiff.@DSOSUF@ -O libtiff.so; \ + -lns libtiff.@DSOSUF@ -O libtiff.dylib; \ else \ ${INSTALL} -idb tiff.sw.tools.nostrip -m 555 \ -F ${DESTDIR}@DIR_LIB@ -O libtiff.@DSOSUF@; \