diff -r 56cda23f48d4 -r bb7a1f5a8b48 src/server/Makefile
--- a/src/server/Makefile	Mon Dec 31 00:07:52 2012 +0100
+++ b/src/server/Makefile	Tue Jan 01 13:32:04 2013 +0100
@@ -26,16 +26,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-BUILD_ROOT = ../../
-include $(BUILD_ROOT)config.mk
-
-CFLAGS  = -xc99
+BUILD_ROOT = ../..
+include $(BUILD_ROOT)/config.mk
 
-LDFLAGS = -pg -lpthread -ldl -lposix4  -lsocket -lnsl -lgen -lm -lsendfile -lxerces-c -lldap
+LDFLAGS = -pg -lpthread -ldl -lnsl -lm -lxerces-c -lldap
 
-OBJ_DIR = $(BUILD_ROOT)build/
+OBJ_DIR = $(BUILD_ROOT)/build/
 
-MAIN_TARGET = $(BUILD_ROOT)work/bin/webservd
+MAIN_TARGET = $(BUILD_ROOT)/work/bin/webservd
 
 all: preparation $(MAIN_TARGET)
 
@@ -59,7 +57,7 @@
 
 OBJ_DIRS = daemon safs ucx util webdav config admin
 MK_OBJ_DIRS = $(OBJ_DIRS:%=$(OBJ_DIR)server/%)
-MK_OBJ_DIRS += $(BUILD_ROOT)work/bin
+MK_OBJ_DIRS += $(BUILD_ROOT)/work/bin
 
 include ucx/Makefile
 
@@ -69,11 +67,11 @@
 	mkdir -p $@
 
 $(MAIN_TARGET): $(MAINOBJS)
-	CC -o $(MAIN_TARGET) $(LDFLAGS) $(MAINOBJS)
+	$(CXX) -o $(MAIN_TARGET) $(LDFLAGS) $(MAINOBJS)
 
 
 ../../build/server/ucx/%.o: %.c
-	cc -o $@ -c $(CFLAGS) $<
+	$(CC) -o $@ -c $(CFLAGS) $<