--- Makefile.orig	Wed Apr 11 18:46:23 2001
+++ Makefile	Tue Jul  3 01:52:23 2001
@@ -1,17 +1,16 @@
-GTK_INCLUDE = `gtk-config --cflags`
-GTK_LIB = `gtk-config --libs`
+GTK_INCLUDE = `$(GTK_CONFIG) --cflags`
+GTK_LIB = `$(GTK_CONFIG) --libs`
 
-IMLIB_INCLUDE = `imlib-config --cflags-gdk`
-IMLIB_LIB = `imlib-config --libs-gdk`
-THREAD_LIB = -lpthread
-INSTALLDIR = /usr/share/gkrellm/plugins
+IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
+IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk`
+INSTALLDIR = $(PREFIX)/libexec/gkrellm/plugins
 
 
-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE)
-LIBS = $(GTK_LIB) $(IMLIB_LIB) $(THREAD_LIB)
+FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) ${PTHREAD_CFLAGS}
+LIBS = $(GTK_LIB) $(IMLIB_LIB) ${PTHREAD_LIBS}
 LFLAGS = -shared
 
-CC = gcc $(CFLAGS) $(FLAGS)
+CC += $(CFLAGS) $(FLAGS)
 
 OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o
 
@@ -26,4 +25,4 @@
 # %.o: %.c
 
 install: gkrellmoon.so
-	sudo install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)
+	$(BSD_INSTALL_DATA) gkrellmoon.so $(INSTALLDIR)