$NetBSD: patch-aa,v 1.3 2000/05/12 12:41:43 kleink Exp $ --- Makefile.orig Wed Apr 12 20:06:49 2000 +++ Makefile Wed Apr 12 20:05:44 2000 @@ -3,15 +3,18 @@ KLAVGVER=1.1 +QTDIR= ${X11BASE}/qt1 +KDEDIR= ${X11BASE} + #------------ -INCDIR = -I$(QTDIR)/include -I$(KDEDIR)/include -I/usr/include/qt -CFLAGS = -DKLAVGVERSION=\"$(KLAVGVER)\" -O2 -fno-strength-reduce -Wall -W -I/usr/X11R6/include +INCDIR = -I$(QTDIR)/include -I$(KDEDIR)/include +CFLAGS = -DKLAVGVERSION=\"$(KLAVGVER)\" -O2 -fno-strength-reduce -Wall -W -I${X11BASE}/include LIBCFLAGS = -LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib -L$(KDEDIR)/lib \ +LFLAGS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -L$(KDEDIR)/lib -Wl,-R$(KDEDIR)/lib \ -lqt -lkdecore -lkdeui -lkfile -lkfm -lXext -lX11 CC = gcc -#MOC = $(QTDIR)/bin/moc -MOC = moc +MOC = $(QTDIR)/bin/moc +#MOC = moc SHELL = /bin/sh @@ -62,5 +65,3 @@ install: $(TARGET) - cp klavg /usr/bin - chown root:root /usr/bin/klavg - chmod a=rx,go-w /usr/bin/klavg + ${BSD_INSTALL_PROGRAM} klavg ${PREFIX}/bin/klavg