--- wmmultipop3/Makefile.orig	Sun May 26 13:43:33 2002
+++ wmmultipop3/Makefile	Sun May 26 19:40:43 2002
@@ -1,14 +1,13 @@
-LIBDIR = -L/usr/X11R6/lib
+LIBDIR = -L${X11BASE}/lib
 LIBS   = -lXpm -lXext -lX11
-FLAGS  = -O2
 OBJS   = wmmultipop3.o Pop3Client.o ../wmgeneral/wmgeneral.o ../wmgeneral/misc.o ../wmgeneral/list.o
 
 
 .c.o:
-	cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
+	${CC} -I${X11BASE}/include ${CFLAGS} -c -Wall $< -o $@
 
 wmmultipop3: $(OBJS) 
-	cc $(FLAGS) -o wmmultipop3 $^ -lXext $(LIBDIR) $(LIBS)
+	${CC} ${CFLAGS} -o wmmultipop3 ${OBJS} ${LIBDIR} ${LIBS}
 
 all:: wmmultipop3