$NetBSD: patch-aa,v 1.1.1.1 2000/11/01 15:04:46 tron Exp $

--- Makefile.orig	Wed Oct 11 20:08:29 2000
+++ Makefile	Wed Nov  1 15:56:37 2000
@@ -6,7 +6,7 @@
 # a smaller and thinner font
 #FONT=neep9
 
-CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I/usr/X11R6/include -I/usr/local/include -W
+CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(LOCALBASE)/include -I$(X11BASE)/include -I/usr/local/include -W
 
 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)
@@ -14,20 +14,20 @@
 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
+EXPLIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -lpng -lz -lm
 endif
 
 all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
-	sync
+#	sync
 
 alevt: $(OBJS)
-	$(CC) $(OPT) $(OBJS) -o alevt -L/usr/X11R6/lib -lX11 $(EXPLIBS)
+	$(CC) $(OPT) $(LDFLAGS) $(OBJS) -o alevt -L/usr/X11R6/lib -lX11 $(EXPLIBS)
 
 alevt-date: $(TOBJS)
-	$(CC) $(OPT) $(TOBJS) -o alevt-date
+	$(CC) $(OPT) $(LDFLAGS) $(TOBJS) -o alevt-date
 
 alevt-cap: $(COBJS)
-	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
+	$(CC) $(OPT) $(LDFLAGS) $(COBJS) -o alevt-cap $(EXPLIBS)
 
 font.h: fontsize.h
 fontsize.h: font1.xbm font2.xbm
@@ -62,21 +62,21 @@
 	install -m 0755 alevt		${RPM_BUILD_ROOT}/usr/X11R6/bin
 	install -m 0755 alevt-date	${RPM_BUILD_ROOT}/usr/X11R6/bin
 	install -m 0755 alevt-cap	${RPM_BUILD_ROOT}/usr/X11R6/bin
-	install -m 0644 alevt.1x	${RPM_BUILD_ROOT}/usr/X11R6/man/man1
+	install -m 0644 alevt.1x	${RPM_BUILD_ROOT}/usr/X11R6/man/man1/alevt.1
 	install -m 0644 alevt-date.1	${RPM_BUILD_ROOT}/usr/X11R6/man/man1
 	install -m 0644 alevt-cap.1	${RPM_BUILD_ROOT}/usr/X11R6/man/man1
 
 # anything below this line is just for me!
 
 install: all
-	install -m 0755 alevt		/usr/local/bin
-	install -m 0755 alevt-date	/usr/local/bin
-	install -m 0755 alevt-cap	/usr/local/bin
-	install -m 0644 alevt.1x	/usr/local/man/man1
-	install -m 0644 alevt-date.1	/usr/local/man/man1
-	install -m 0644 alevt-cap.1	/usr/local/man/man1
-	install -m 0644 contrib/mini-alevt.xpm /usr/include/X11/pixmaps
-	sync
+	$(BSD_INSTALL_PROGRAM) alevt		$(PREFIX)/bin
+	$(BSD_INSTALL_PROGRAM) alevt-date	$(PREFIX)/bin
+	$(BSD_INSTALL_PROGRAM) alevt-cap	$(PREFIX)/bin
+	$(BSD_INSTALL_DATA) alevt.1x	$(PREFIX)/man/man1
+	$(BSD_INSTALL_DATA) alevt-date.1	$(PREFIX)/man/man1
+	$(BSD_INSTALL_DATA) alevt-cap.1	$(PREFIX)/man/man1
+	$(BSD_INSTALL_DATA) contrib/mini-alevt.xpm $(PREFIX)/share/pixmaps
+#	sync
 
 depend:
 	makedepend -Y -- $(CFLAGS_none) -- *.c 2>/dev/null