--- Makefile.orig	Wed Jan 12 01:42:25 2000
+++ Makefile	Tue Sep 19 05:24:13 2000
@@ -1,20 +1,20 @@
-CC     = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
+CC     ?= gcc
+CFLAGS ?= -O2 -Wall
+INCDIR = -I${LOCALBASE}/include
+DESTDIR= ${PREFIX}
+LIBDIR = -L${LOCALBASE}/lib
 LIBS   = -lXpm -lX11 -lXext
 OBJS   = wmapm.o \
          ../wmgeneral/wmgeneral.o
 
 .c.o:
-	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
+	$(CC) $(CFLAGS) -D$(OPSYS) -c $< -o $@ $(INCDIR)
 
 all:	wmapm.o wmapm
 
 wmapm.o: wmapm_master.xpm wmapm_mask.xbm wmapm.h
 wmapm: $(OBJS)
-	$(CC) $(COPTS) $(SYSTEM) -o wmapm $^ $(INCDIR) $(LIBDIR) $(LIBS)
+	$(CC) $(CFLAGS) $(SYSTEM) -o wmapm $(OBJS) $(LIBDIR) $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \
@@ -23,7 +23,6 @@
 	rm -f wmapm
 
 install:: wmapm
-	install -s -m 0755 wmapm $(DESTDIR)/bin
-	install    -m 0644 wmapm.1 $(DESTDIR)/man/man1 
-	chmod +s $(DESTDIR)/bin/wmapm
+	${BSD_INSTALL_PROGRAM} wmapm $(DESTDIR)/bin
+	${BSD_INSTALL_MAN} wmapm.1 $(DESTDIR)/man/man1