--- Makefile.orig	Sun May 31 03:35:42 2009
+++ Makefile	Tue Jul 14 18:44:12 2009
@@ -3,9 +3,6 @@
 # User Options
 #######################################################################
 
-# Directory where qiv will be installed under.
-PREFIX = /usr/local
-
 # Font to use for statusbar in fullscreen mode
 STATUSBAR_FONT = "fixed"
 
@@ -49,15 +46,6 @@ MAGIC = -DHAVE_MAGIC
 # Do not edit below here!
 ######################################################################
 
-CC        = gcc
-#CFLAGS    = -O -g -Wall
-CFLAGS    = -O2 -Wall \
-	    -fcaller-saves -ffast-math -fno-strength-reduce \
-	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
-#CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
-#	    -fcaller-saves -ffast-math -fno-strength-reduce \
-#	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
-
 INCLUDES  := $(shell pkg-config --cflags gdk-2.0 imlib2)
 LIBS      := $(shell pkg-config --libs gdk-2.0 imlib2)
 
@@ -136,13 +124,7 @@ distclean : clean
 
 install: $(PROGRAM)
 	@echo "Installing QIV..."
-	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
-	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
-	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
-	@if ./qiv -f ./intro.jpg ; \
-	then echo "-- Test Passed --" ; \
-	else echo "-- Test Failed --" ; \
-	fi
-	@echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
+	$(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin
+	$(BSD_INSTALL_MAN) $(PROGRAM).1 $(PREFIX)/man/man1
 
 # the end... ;-)