$OpenBSD: patch-Makefile,v 1.2 2001/03/17 15:36:09 wilfried Exp $
--- Makefile.orig	Fri Mar 16 19:54:27 2001
+++ Makefile	Fri Mar 16 19:55:21 2001
@@ -22,15 +22,18 @@
 #  uncommented and set accordingly, if needed.
 #
 #========================================================================
+# Installation prefix.
+PREFIX           =$(DESTDIR)/usr/local
+#------------------------------------------------------------------------
 #  If you want audio support, then the following line should be uncommented.
 #
-#AUDIO_SUPPORT     = -DAUDIO_SUPPORT
+AUDIO_SUPPORT     = -DAUDIO_SUPPORT
 #========================================================================
 #  There is a default command (/usr/demo/SOUND/play), which is used to
 #  play audio files. Alternatively you can specify your own custom
 #  command here. Uncomment the following line and set appropriately.
 #
-#AUDIO_CMD         = -DAUDIO_CMD=\"/usr/local/bin/play\"
+AUDIO_CMD         = -DAUDIO_CMD=\"/usr/local/bin/rplay\"
 #========================================================================
 #  Faces displays a background pattern in its' window. When the window
 #  is not completely full, this gives the appearance of trying to blend
@@ -54,8 +57,8 @@
 #  NOTE that for this to work you must have at least a minimal
 #  /etc/resolv.conf file containing a valid nameserver entry.
 #
-#DNSLOOKUP	= -DDNSLOOKUP
-#DNSLIB		= -lresolv
+DNSLOOKUP	= -DDNSLOOKUP
+DNSLIB		=
 #------------------------------------------------------------------------
 #  If you do not want to show the number of messages on the face icon,
 #  then uncomment the next line.
@@ -77,7 +80,7 @@
 #  be uncommented and set appropriately. Note that the value must be
 #  a single directory name, not a colon separated list of paths.
 #               
-FACEDIR           = /usr/local/faces
+FACEDIR           = $(PREFIX)/share/faces
 CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
 #------------------------------------------------------------------------
 #  It is possible to determine what type of monitoring faces does at
@@ -123,7 +126,7 @@ CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
 #  Note that the domain name will be converted to lower case before
 #  attempting to match in the machines file, or create an icon filename.
 #
-#NISLOOKUP	= -DNISLOOKUP
+NISLOOKUP	= -DNISLOOKUP
 #------------------------------------------------------------------------
 #  If you don't want faces to use full domain names for extracting face
 #  icons, then you should uncomment the NODOMAINS definition below.
@@ -188,7 +191,7 @@ CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
 #  to the select call are different, and this definition should be
 #  uncommented. You need to uncomment this for SunOS v3.x.
 #
-#SELTYPE        = -DNO_43SELECT
+SELTYPE        = -DNO_43SELECT
 #------------------------------------------------------------------------
 #  If you are building faces on a Silicon Graphics machine, then you will
 #  need to uncomment the following two definitions.
@@ -199,7 +202,7 @@ CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
 #  If the pending mail for users is in a different directory than
 #  /usr/spool/mail, uncomment the following and set appropriately.
 #
-#SPOOLDIR	= -DSPOOLDIR=\"/usr/mail\"
+SPOOLDIR	= -DSPOOLDIR=\"/var/mail\"
 #------------------------------------------------------------------------
 #  If faces is setup to monitor mail, then the name of the default
 #  spoolfile is /usr/spool/mail/username. An alternative spoolfile name
@@ -258,8 +261,8 @@ CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
 #  library files are not in a standard place, then the following
 #  two lines should be uncommented, and set appropriately.
 #
-#X11INCDIR         = -I$(OPENWINHOME)/include
-#X11LIBDIR         = -L$(OPENWINHOME)/lib
+X11INCDIR         = -I$(X11BASE)/include
+X11LIBDIR         = -L$(X11BASE)/lib
 #------------------------------------------------------------------------
 #  If you are compiling the XView version, then the following two lines
 #  should be uncommented, and set appropriately.
@@ -272,16 +275,17 @@ CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
 #  Default locations where faces files will be installed.
 #  You might wish to alter these values.
 #
-BINDIR		= /usr/local/bin
-LIBDIR		= /usr/local/lib
-MANDIR		= /usr/man
-MANSECT		= l
+BINDIR		= $(PREFIX)/bin
+LIBDIR		= $(PREFIX)/lib
+INCDIR		= $(PREFIX)/include
+MANDIR		= $(PREFIX)/man
+MANSECT		= 1
 
 #
 #  Options for submakes
 #
 MAKEOPTS	= $(MFLAGS) BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) \
-			    MANDIR=$(MANDIR) CC=$(CC) \
+			    INCDIR=$(INCDIR) MANDIR=$(MANDIR) CC=$(CC) \
 			    NOINDEX=$(NOINDEX) SYSV=$(SYSV)
 
 #
@@ -302,8 +306,7 @@ CDEFS		= $(AUDIO_SUPPORT) $(AUDIO_CMD) $
 		  $(SELTYPE) $(SGIDEF) $(SPOOLDIR) $(SPOOLFILE) $(SYSV) \
 		  $(TTEXT) $(TOPIX) $(UPDATE) $(USE_BZERO) $(USE_GETWD) \
 		  $(X11R3) $(X11INCDIR) $(XVIEWINCDIR) $(DEBUG)
-CCOMP		= -O
-CFLAGS		= $(CCOMP) $(CDEFS)
+CFLAGS		+= $(CDEFS)
 #
 #=======================================================================
 
@@ -311,12 +314,11 @@ CFLAGS		= $(CCOMP) $(CDEFS)
 
 BINARIES	= psfaces svfaces xfaces xvfaces
 
-CC		= cc
 MAKE		= make
 
 STDSRCS		= address.c get.c main.c mon.c parsefrom.c rec.c
 STDOBJS		= address.o get.o main.o mon.o parsefrom.o rec.o
-STDLIBS		= compface/libcompface.a $(DNSLIB) $(SGILIBS)
+STDLIBS		= -L./compface -lcompface $(DNSLIB) $(SGILIBS)
 
 COMPFACE	= compface
 FACES		= facedir
@@ -357,7 +359,7 @@ SVIEWLIBS	= -lsuntool -lsunwindow -lpixr
 #  Dell Unix (Interactive 386/ix): $(X11LIBDIR) -lX11 -linet
 #  AT&T's XWIN:                    $(X11LIBDIR) -lX11_s -lc_s -lnsl_s -lpt
 #
-X11LIBS		= $(X11LIBDIR) -lX11
+X11LIBS		= -L/usr/X11R6/lib -lX11
 XVIEWLIBS	= $(XVIEWLIBDIR) -lxview -lolgx -lX11
 
 help:
@@ -375,7 +377,7 @@ help:
 		@echo "  make clean"
 		@echo
 
-all:		$(BINARIES)
+all:		x11
 
 news:		$(STDOBJS) news.o faces_cps.h
 		(cd compface; $(MAKE) $(MAKEOPTS))
@@ -411,16 +413,18 @@ tables:
 		-install -c -m 644 people.tab $(FACEDIR)
 
 install:
+		make tables
 		(cd compface; $(MAKE) $(MAKEOPTS) install)
 		(cd filters; $(MAKE) $(MAKEOPTS) install)
 		(cd scripts; $(MAKE) $(MAKEOPTS) install)
-		install -s -m 751 faces $(BINDIR)
+		install -c -s -m 751 faces $(BINDIR)
 		install -c -m 755 face_update $(BINDIR)
 		install -c -m 755 faces.sendmail $(BINDIR)
 		install -c -m 644 faces.man \
 				$(MANDIR)/man$(MANSECT)/faces.$(MANSECT)
-		install -c -m 644 face_update.1 \
+		install -c -m 444 face_update.1 \
 				$(MANDIR)/man$(MANSECT)/face_update.$(MANSECT)
+		install -c -m 444 -o bin Faces.ad ${PREFIX}/lib/X11/app-defaults/Faces
 
 clean:
 		(cd compface; $(MAKE) $(MAKEOPTS) clean)
