--- wmapm/Makefile.orig	Tue Jan 11 17:42:25 2000
+++ wmapm/Makefile	Tue Jan  9 19:47:50 2001
@@ -1,20 +1,17 @@
-CC     = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
+CFLAGS += -I${X11BASE}/include
+LIBDIR = -L${X11BASE}/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) -c $< -o $*.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) $(COPTS) $(SYSTEM) -o wmapm $(OBJS) $(INCDIR) $(LIBDIR) $(LIBS)
 
 clean:
 	for i in $(OBJS) ; do \
@@ -23,7 +20,6 @@ clean:
 	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 $(PREFIX)/bin
+	$(BSD_INSTALL_MAN) wmapm.1 $(PREFIX)/man/man1 
+#	chmod +s $(DESTDIR)/bin/wmapm