$NetBSD: patch-aa,v 1.5 2004/11/26 22:18:28 snj Exp $ --- Makefile.orig 2004-05-22 00:21:47.000000000 -0700 +++ Makefile 2004-11-26 14:05:41.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" @@ -57,11 +57,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` @@ -96,10 +91,10 @@ SS_PROG = $(PREFIX)/ss-qiv all: $(PROGRAM) $(PROGRAM): $(OBJS) - $(CC) $(CFLAGS) $(DEFINES) $(OBJS) $(LIBS) -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 @@ -124,14 +119,8 @@ 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_DATA) $(PROGRAM).1 $(PREFIX)/man/man1 install-xscreensaver: install @echo "#!/bin/sh" > $(SS_PROG)