$OpenBSD: patch-server_Makefile,v 1.5 2004/06/18 08:48:35 robert Exp $
--- server/Makefile.orig	2004-04-12 06:30:48.000000000 -0700
+++ server/Makefile	2004-06-15 10:17:08.000000000 -0700
@@ -3,22 +3,19 @@ PKG_CONFIG ?= pkg-config
 BINMODE ?= 755
 
 INSTALLROOT ?= $(DESTDIR)$(PREFIX)
-ifeq ($(INSTALLROOT),)
-	INSTALLROOT = /usr/local
-endif
 
-SINSTALLDIR ?= $(INSTALLROOT)/bin
+SINSTALLDIR ?= $(INSTALLROOT)/sbin
 INSTALLDIRMODE ?= 755
 
 INCLUDEDIR ?= $(INSTALLROOT)/include
 INCLUDEMODE ?= 644
 INCLUDEDIRMODE ?= 755
 
-SMANDIR ?= $(INSTALLROOT)/share/man/man1
+SMANDIR ?= $(INSTALLROOT)/man/man1
 MANMODE ?= 644
 MANDIRMODE ?= 755
 INSTALL ?= install
-LINK_FLAGS ?= -Wl,-E
+LINK_FLAGS ?= -Wl
 CC ?= gcc
 STRIP ?= -s
 
@@ -30,22 +27,22 @@ PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0
 GLIB12_INCLUDE = `glib-config --cflags`
 GLIB12_LIB = `glib-config --libs glib gmodule`
 
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS += -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
 ifeq ($(glib12),1)
-FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+FLAGS += -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
 endif
 ifeq ($(glib12),yes)
-FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+FLAGS += -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
 endif
 
 FLAGS+= $(PTHREAD_INC)
 
-LIBS = $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) 
+LIBS += $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) 
 ifeq ($(glib12),1)
-LIBS = $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS)
+LIBS += $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS)
 endif
 ifeq ($(glib12),yes)
-LIBS = $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS)
+LIBS += $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS)
 endif
 
 ifeq ($(debug),1)
@@ -78,8 +75,7 @@ ifeq ($(HAVE_GETADDRINFO),1)
 endif
 
 
-override CC += -Wall $(FLAGS)
-
+CFLAGS += $(FLAGS)
 OS_NAME=$(shell uname -s)
 OS_RELEASE=$(shell uname -r)
 
