$NetBSD: patch-aa,v 1.4 2004/02/17 15:20:47 snj Exp $

--- Makefile.orig	2003-01-13 03:57:42.000000000 -0800
+++ Makefile	2004-02-17 07:09:06.000000000 -0800
@@ -4,7 +4,7 @@
 ######################################################################
 
 # Directory where qiv will be installed under.
-PREFIX = /usr/local
+#PREFIX = /usr/local
 
 # Font to use for statusbar in fullscreen mode
 STATUSBAR_FONT = "fixed"
@@ -53,11 +53,6 @@ SS_RANDOMIZE = -r
 # Do not edit below here!
 ######################################################################
 
-CC        = gcc
-CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
-	    -fcaller-saves -ffast-math -fno-strength-reduce \
-	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
-
 INCLUDES  = `imlib-config --cflags-gdk`
 LIBS      = `imlib-config --libs-gdk`
 
@@ -87,10 +82,10 @@ SS_PROG   = $(PREFIX)/ss-qiv
 all: $(PROGRAM)
 
 $(PROGRAM): $(OBJS)
-	$(CC) $(CFLAGS) $(DEFINES) $(LIBS) $(OBJS) -o $(PROGRAM)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
 
 $(OBJS): %.o: %.c $(HEADERS)
-	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
 
 main.o: main.h
 
@@ -115,13 +110,8 @@ distclean : clean
 
 install: $(PROGRAM)
 	@echo "Installing..."
-	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
-	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
-	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
-	@if ./qiv -o white -f ./intro.jpg ; \
-	then echo "-- Test Passed --" ; \
-	else echo "-- Test Failed --" ; \
-	fi
+	$(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin
+	$(BSD_INSTALL_DATA) $(PROGRAM).1 $(PREFIX)/man/man1
 
 install-xscreensaver: install
 	@echo "#!/bin/sh" > $(SS_PROG)
