--- pbm/Makefile.orig	Sat Nov 20 09:59:20 1993
+++ pbm/Makefile	Mon Jan  8 15:24:26 2001
@@ -18,14 +18,16 @@
 TIFFDEF =       -DLIBTIFF
 #LDFLAGS =	-s
 LDFLAGS =	
-INSTALLBINARIES =	/usr/new/pbm
-INSTALLMANUALS1 =	/usr/man/man1
+INSTALLBINARIES =	$(PREFIX)/bin
+INSTALLMANUALS1 =	$(PREFIX)/man/man1
 SUFFIXMANUALS1 =	1
-INSTALLMANUALS3 =	/usr/man/man3
+INSTALLMANUALS3 =	$(PREFIX)/man/man3
 SUFFIXMANUALS3 =	3
-INSTALLMANUALS5 =	/usr/man/man5
+INSTALLMANUALS5 =	$(PREFIX)/man/man5
 SUFFIXMANUALS5 =	5
-MANCP =			cp
+MANCP =			install -c -m 0644
+INSTALLLIBS =		$(PREFIX)/lib
+INSTALLDEFS =		$(PREFIX)/include
 
 SHELL =		/bin/sh
 INCLUDE =	-I..
@@ -67,17 +69,19 @@
 MANUALS5 =	pbm
 
 
-#all:		binaries
-all:		merge
-#install:	install.bin
-install:	install.merge
+all:		binaries
+#all:		merge
+install:	install.bin
+#install:	install.merge
 
 
 binaries:	$(BINARIES)
 
 install.bin:	binaries
 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
-	cp $(BINARIES) $(INSTALLBINARIES)
+	install -c -s -m 0755 $(BINARIES) $(INSTALLBINARIES)
+	install -c -m 0644 $(LIBPBM) $(INSTALLLIBS)
+	install -c -m 0644 $(DEFPBM) $(INSTALLDEFS)
 
 
 merge:		pbmmerge
@@ -184,4 +188,4 @@
 pbmtoepsi pbmtoepsi.o:		pbmtoepsi.c
 
 clean:
-	-rm -f *.o *.a *.cat *~ core $(BINARIES) pbmmerge
+	-rm -f *.o *.a *.cat *~ core *.core $(BINARIES) pbmmerge
