--- ray/src/px/Rmakefile	2004/11/25 14:47:03	2.56
+++ ray/src/px/Rmakefile	2005/07/08 16:04:57	2.58
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.56 2004/11/25 14:47:03 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.58 2005/07/08 16:04:57 greg Exp $
 #
 # Compiles for image processing and display programs
 #
@@ -30,19 +30,20 @@ ogl:
 sun:
 
 install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
-pdfblur.csh pmblur.csh xyzimage.csh pgblur.csh
+pdfblur.csh pmblur.csh pmdblur.csh xyzimage.csh pgblur.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
 	cp falsecolor.csh $(INSTDIR)/falsecolor
 	cp pdfblur.csh $(INSTDIR)/pdfblur
 	cp pmblur.csh $(INSTDIR)/pmblur
+	cp pmdblur.csh $(INSTDIR)/pmdblur
 	cp xyzimage.csh $(INSTDIR)/xyzimage
 	cp phisto.csh $(INSTDIR)/phisto
 	cp pdelta.csh $(INSTDIR)/pdelta
 	cp pgblur.csh $(INSTDIR)/pgblur
 	cp ra_pfm.csh $(INSTDIR)/ra_pfm
 	cd $(INSTDIR) ; chmod 755 normpat falsecolor pdfblur \
-		pmblur xyzimage phisto pdelta pgblur ra_pfm
+		pmblur pmdblur xyzimage phisto pdelta pgblur ra_pfm
 
 clean:
 	rm -f $(PROGS) $(SPECIAL) *.o core
@@ -129,10 +130,15 @@ ra_tiff:	ra_tiff.o ../lib/libtiff.a
 normtiff:	normtiff.o ../lib/libtiff.a
 	$(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
 
-../lib/libtiff.a:	tiff/config.local
-	cd tiff ; sh configure -quiet -noninteractive -with-CC=$(CC) \
+../lib/libtiff.a:
+	cd tiff ; configure -quiet -with-CC=$(CC) \
+		"--libdir=`pwd`/../../lib" "--includedir=`pwd`/../../common" \
+		--enable-static --disable-shared --disable-cxx \
+		--enable-logluv --disable-jpeg \
+		--disable-zlib --disable-pixarlog \
 		"-with-ENVOPTS=$(OPT)" ; \
-	cd libtiff ; make install
+	cd port ; make all ; \
+	cd ../libtiff ; make install
 
 xshowtrace:	xshowtrace.o x11findwind.o
 	$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \