--- Makefile.orig	Fri Dec  4 02:03:58 1998
+++ Makefile	Mon Apr 12 00:05:16 1999
@@ -2,22 +2,24 @@
 #	Makefile,v 1.8 1998/12/03 15:33:58 rneswold Exp
 #
 
-PREFIX=/usr/local
 MANDIR=${PREFIX}/man
 BINDIR=${PREFIX}/bin
 
-LIBDIR = -L/usr/X11R6/lib -L/usr/local/lib
+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib
 LIBS = -lXpm -lXext -lX11 -lkvm
 OBJS =	main.o if.o wmgeneral.o
 INCDIR = -I${X11BASE}/include
 
+CC ?= cc
+CFLAGS ?= -O
+
 .c.o :
-	cc -c -g -O1 -Wall ${INCDIR} $< -o $*.o
+	$(CC) -c $(CFLAGS) -g -Wall ${INCDIR} $< -o $*.o
 
 all :: wmnet
 
 wmnet : $(OBJS)
-	cc -o wmnet $(OBJS) $(LIBDIR) $(LIBS) ${INCDIR}
+	$(CC) -o wmnet $(OBJS) $(LIBDIR) $(LIBS) ${INCDIR}
 
 main.o : wmnet-mask.xbm wmnet-master.xpm wmnet.h wmgeneral.h