Index: server/Makefile
diff -u server/Makefile.orig server/Makefile
--- server/Makefile.orig	Tue Sep 17 04:36:14 2002
+++ server/Makefile	Fri Sep 20 18:33:15 2002
@@ -13,12 +13,12 @@
 PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0`
 PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gthread-2.0`
 
-GLIB12_INCLUDE = `glib-config --cflags gthread`
-GLIB12_LIB = `glib-config --libs gthread`
+GLIB12_INCLUDE = `$(GLIB_CONFIG) --cflags gthread`
+GLIB12_LIB = `$(GLIB_CONFIG) --libs gthread`
 
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) -I$(LOCALBASE)/include
 ifeq ($(glib12),1)
-FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) -I$(LOCALBASE)/include
 endif
 
 FLAGS+= $(PTHREAD_INC)
@@ -81,7 +81,7 @@
 install:
 	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
 	$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
-	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
+	$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).8
 
 install_darwin:
 	$(MAKE) install STRIP=