update from branch, don't install libscp in /usr/lib

sesman/Makefile

@@ -1,5 +1,4 @@
 # sesman makefile
-LIBSCPOBJ = libscp_vX.o libscp_v0.o libscp_v1s.o
 
 SESMANOBJ = sesman.o config.o sig.o session.o env.o \
             os_calls.o d3des.o list.o file.o log.o access.o \
@@ -14,12 +13,11 @@ MANDIR = /usr/local/man
 DOCDIR = /usr/doc/xrdp
 
 DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
-          -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
-          -DSESMAN_SESSVC_FILE=\"$(DESTDIR)/sessvc\" \
-	  -DDEBUG
+	  -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
+	  -DSESMAN_SESSVC_FILE=\"sessvc\"
 
 CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
-LDFLAGS = -L /usr/gnu/lib -I/usr/include/nptl -L/usr/lib/nptl -lpthread -ldl -Wl,-rpath,./libscp -L./libscp -lscp $(DEFINES)
+LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp
 C_OS_FLAGS = $(CFLAGS) -c
 CC = gcc
 

sesman/libscp/Makefile

@@ -1,4 +1,4 @@
-# sesman makefile
+# libscp makefile
 LIBSCPOBJ = libscp_vX.o libscp_v0.o \
 	    libscp_v1s.o libscp_v1c.o \
 	    libscp_init.o libscp_lock.o libscp_tcp.o \
@@ -9,21 +9,19 @@ CFGDIR = /etc/xrdp
 PIDDIR = /var/run
 MANDIR = /usr/local/man
 DOCDIR = /usr/doc/xrdp
-LIBDIR = /usr/lib
 
 DESTDIRDEB = /tmp
 
-LIBSCPLNAME=libscp.so
-LIBSCPSONAME=$(LIBSCPLNAME).1
-LIBSCPFNAME=$(LIBSCPSONAME).0.0
+LIBSCPLNAME = libscp.so
+LIBSCPSONAME = $(LIBSCPLNAME).1
+LIBSCPFNAME = $(LIBSCPSONAME).0.0
 
 DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
-          -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
-          -DSESMAN_SESSVC_FILE=\"$(DESTDIR)/sessvc\" \
-	  -DDEBUG
+	  -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
+	  -DSESMAN_SESSVC_FILE=\"sessvc\"
 
-CFLAGS = -Wall -O2 -I../../common -I/usr/include/nptl -fPIC -g $(DEFINES)
-LDFLAGS = -shared -Wl,-soname,$(LIBSCPSONAME) -L /usr/gnu/lib -I/usr/include/nptl -L/usr/lib/nptl -lpthread $(DEFINES)
+CFLAGS = -Wall -O2 -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
+LDFLAGS = -shared -L/usr/gnu/lib -L/usr/lib/nptl -lpthread
 C_OS_FLAGS = $(CFLAGS) -c
 CC = gcc
 
@@ -35,20 +33,12 @@ clean:
 	rm -f $(LIBSCPOBJ) $(LIBSCPFNAME) $(LIBSCPLNAME)
 
 install:
-	install $(LIBSCPFNAME) $(LIBDIR)/$(LIBSCPFNAME)
-	echo "cd $(LIBDIR) && ln -s $(LIBSCPSONAME) $(LIBSCPLNAME)" | /bin/sh
-	ldconfig
+	install $(LIBSCPFNAME) $(DESTDIR)/$(LIBSCPFNAME)
+	ln -s $(LIBSCPFNAME) $(DESTDIR)/$(LIBSCPLNAME)
 
 installdeb:
-	install $(LIBSCPFNAME) $(DESTDIRDEB)/$(LIBDIR)/$(LIBSCPFNAME)
-	echo "cd $(DESTDIRDEB)/$(LIBDIR) && ln -s $(LIBSCPSONAME) $(LIBSCPLNAME)" | /bin/sh
+	install $(LIBSCPFNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPFNAME)
+	ln -s $(LIBSCPFNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPLNAME)
 
 os_calls.o: ../../common/os_calls.c
 	$(CC) $(C_OS_FLAGS) ../../common/os_calls.c
-
-list.o: ../common/list.c
-	$(CC) $(C_OS_FLAGS) ../common/list.c
-
-log.o: ../common/log.c
-	$(CC) $(C_OS_FLAGS) -DLOG_ENABLE_THREAD ../common/log.c
-