--- Makefile.orig	Tue Aug 20 05:17:53 2002
+++ Makefile	Wed May 25 13:55:10 2005
@@ -1,33 +1,35 @@
 VER=1.6.1
-OPT=-O2 -s
-#OPT=-O -g
+
+.if defined(WITH_PNG)
 DEFS=-DWITH_PNG
+PNG_LIBS=-L${LOCALBASE}/lib -lpng -lz -lm
+.endif
+
+.if defined(WITH_SMALLFONT)
+FONT=neep9
+.else
 FONT=vtxt
-# a smaller and thinner font
-#FONT=neep9
+.endif
 
-CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W
+CFLAGS+=-DVERSION=\"$(VER)\" $(DEFS) -I${X11BASE}/include -I${LOCALBASE}/include -W
+X11_LIBS=-L${X11BASE}/lib -lX11
 
 EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
 OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
 TOBJS=alevt-date.o vbi.o fdset.o misc.o hamm.o lang.o
 COBJS=alevt-cap.o vbi.o fdset.o misc.o hamm.o lang.o $(EXPOBJS)
 
-ifneq ($(findstring WITH_PNG,$(DEFS)),)
-EXPLIBS=-L/usr/local/lib -lpng -lz -lm
-endif
-
 all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
 	sync
 
 alevt: $(OBJS)
-	$(CC) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -lX11 $(EXPLIBS)
+	$(CC) $(CFLAGS) $(OBJS) -o alevt $(PNG_LIBS) $(X11_LIBS)
 
 alevt-date: $(TOBJS)
-	$(CC) $(OPT) $(TOBJS) -o alevt-date
+	$(CC) $(CFLAGS) $(TOBJS) -o alevt-date
 
 alevt-cap: $(COBJS)
-	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
+	$(CC) $(CFLAGS) $(COBJS) -o alevt-cap $(PNG_LIBS)
 
 font.o: font1.xbm font2.xbm
 fontsize.h: font1.xbm font2.xbm