--- src/Makefile.orig	Sun Aug  4 18:00:06 2002
+++ src/Makefile	Sun Aug  4 18:02:29 2002
@@ -1,22 +1,22 @@
-INSTALLDIR ?= /usr/local/lib/gkrellm/plugins
-INSTALL ?= install
+INSTALLDIR ?= ${PREFIX}/libexec/gkrellm/plugins
+INSTALL ?= ${INSTALL_PROGRAM}
 
-GTK_INCLUDE = `gtk-config --cflags`
-GTK_LIB = `gtk-config --libs`
+GTK_INCLUDE = `${GTK_CONFIG} --cflags`
+GTK_LIB = `${GTK_CONFIG} --libs`
 
 ifeq ($(alsa5),1)
 SD_INCLUDE =
 SD_LIB = -lasound
 else
-SD_INCLUDE = `esd-config --cflags`
-SD_LIB = `esd-config --libs`
+SD_INCLUDE = `${ESD_CONFIG} --cflags`
+SD_LIB = `${ESD_CONFIG} --libs`
 endif
 
-FFTW_LIB_DIR ?=
+FFTW_LIB_DIR ?= -L${LOCALBASE}/lib
 
 FFTW_LIB = $(FFTW_LIB_DIR) -lrfftw -lfftw
 
-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(SD_INCLUDE)
+FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(SD_INCLUDE)
 LIBS = $(GTK_LIB) $(SD_LIB) $(FFTW_LIB) -lm
 LFLAGS = -shared
 
@@ -32,7 +32,7 @@
     FLAGS += -DGKRELLM_ALSA5
 endif
 
-CC = gcc $(FLAGS) $(CFLAGS)
+CC += $(FLAGS) $(CFLAGS)
 
 OBJS = gkrellmss.o oscope.o spectrum.o sdlib.o
 
@@ -45,8 +45,7 @@
 	rm -f *.o core *.so* *.bak *~
 
 install: 
-	$(INSTALL) -d -m 755 $(INSTALLDIR)
-	$(INSTALL) -c -s -m 755 gkrellmss.so $(INSTALLDIR)
+	$(INSTALL) gkrellmss.so $(INSTALLDIR)
 
 gkrellmss.o: gkrellmss.c gkrellmss.h
 oscope.o: oscope.c gkrellmss.h