--- Makefile.orig	Tue Feb  1 17:39:53 2000
+++ Makefile	Tue Feb  1 17:44:42 2000
@@ -1,9 +1,9 @@
-prefix=
-BIN=/usr/X11R6/bin
-CONF=/etc
-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+CFLAGS = -c -Wall
+CONF = ${X11BASE}/etc
+LIBDIR = -L${X11BASE}/lib
+INCLUDES = -I${X11BASE}/include
 LIBS   = -lXpm -lXext -lX11
-CFLAGS = -O2 -Wall
 OBJS =	wmbiff.o Pop3Client.o \
 	../wmgeneral/wmgeneral.o \
 	../wmgeneral/misc.o \
@@ -11,11 +11,11 @@
 
 
 .c.o:
-	cc -I/usr/X11R6/share/include $(CFLAGS) -c -Wall $< -o $*.o
+	${CC} ${INCLUDES} ${CFLAGS} $< -o $*.o
 
 wmbiff: $(OBJS)
-	cc $(CFLAGS) -o wmbiff $^ $(LIBDIR) $(LIBS)
-	strip wmbiff
+	${CC} -o wmbiff $^ ${LIBDIR} ${LIBS}
+	@/usr/bin/strip wmbiff
 
 all:: wmbiff
 
@@ -26,5 +26,4 @@
 	rm -f wmbiff *~ tags
 
 install:: wmbiff
-	cp -f wmbiff $(prefix)$(BIN)/
-	chmod 755 $(prefix)$(BIN)/wmbiff
+	@/usr/bin/install -c -o 0 -g 0 -s -m 755 wmbiff ${X11BASE}/bin/wmbiff