--- wmmultipop3/Makefile.orig	Sat Sep 22 11:29:50 2001
+++ wmmultipop3/Makefile	Fri Sep 28 16:36:39 2001
@@ -1,16 +1,15 @@
-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 -c $< -o $*.o
 
 wmmultipop3: $(OBJS) 
-	cc $(FLAGS) -o wmmultipop3 $^ -lXext $(LIBDIR) $(LIBS)
+	$(CC) -o wmmultipop3 $^ $(LIBDIR) $(LIBS)
 
-all:: wmpop3
+all:: wmmultipop3
 
 clean::
 	for i in $(OBJS) ; do \
