--- tools/Makefile.in.orig	Mon Dec 20 18:46:11 1999
+++ tools/Makefile.in	Sun Jan 23 16:02:08 2000
@@ -43,17 +43,16 @@
 INSTALL	= @INSTALL@
 #
 COPTS	= @GCOPTS@
-OPTIMIZER=-O
 IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
-CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
+CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} -L../libtiff
 #
-TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF@
+TIFFLIB	= ${DEPTH}/libtiff/libtiff.@DSOSUF_VERSION@
 LIBJPEG	= @LIBJPEG@
 LIBGZ	= @LIBGZ@
 LIBTIFF	= @TIFFLIBREF@
 LIBPORT	= @LIBPORT@
 MACHLIBS= @MACHDEPLIBS@
-LIBS	= ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}
+LIBS	= @LIBPORT@ -ltiff ${LIBJPEG} ${LIBGZ} ${LIBPORT} @MACHDEPLIBS@
 #
 OBJS=	\
 	fax2tiff.o \
@@ -108,8 +107,8 @@
 	    true; \
 	fi
 install: all
-	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@
-	${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
+	${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
+	${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
 	@if [ "@LIBIMAGE@" = yes ]; then \
 	    ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
 	else \
