--- Makefile.orig	2007-09-24 22:03:04 +0400
+++ Makefile	2007-09-24 22:04:39 +0400
@@ -46,7 +46,7 @@ install:
 	make -C sesman install
 	make -C xup install
 	make -C docs install
-	if [ -d /etc/pam.d ]; then install instfiles/pam.d/sesman /etc/pam.d/sesman; fi
+	install instfiles/pam.d/sesman $(CFGDIR)/../pam.d/sesman
 	install instfiles/xrdp_control.sh $(DESTDIR)/xrdp_control.sh
 
 installdeb:


--- sesman/libscp/Makefile.orig	2007-05-28 03:20:48 +0400
+++ sesman/libscp/Makefile	2007-09-24 22:17:07 +0400
@@ -19,8 +19,9 @@ DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/
 	  -DSESMAN_SESSVC_FILE=\"sessvc\"
 
 CFLAGS = -Wall -O2 -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
-LDFLAGS = -shared -L/usr/gnu/lib -L/usr/lib/nptl -lpthread
+LDFLAGS = -shared -L/usr/gnu/lib -L/usr/lib/nptl
 C_OS_FLAGS = $(CFLAGS) -c
+LDADD = -ldl -lpthread
 CC = gcc
 
 all: $(LIBSCPOBJ)

--- sesman/libscp/Makefile.orig	2007-09-24 22:18:06 +0400
+++ sesman/libscp/Makefile	2007-09-24 22:19:09 +0400
@@ -25,7 +25,7 @@ LDADD = -ldl -lpthread
 CC = gcc
 
 all: $(LIBSCPOBJ)
-	$(CC) $(LDFLAGS) -o $(LIBSCPLNAME) $(LIBSCPOBJ)
+	$(CC) $(LDFLAGS) -o $(LIBSCPLNAME) $(LIBSCPOBJ) $(LDADD)
 
 clean:
 	rm -f $(LIBSCPOBJ) $(LIBSCPLNAME)

--- xrdp/Makefile.orig	2007-04-13 07:50:59 +0400
+++ xrdp/Makefile	2007-09-24 22:22:22 +0400
@@ -18,7 +18,7 @@ DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xr
 CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
-LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,.
+LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,$(DESTDIR)
 LIBS = -ldl -lpthread -lxrdp
 CC = gcc
 

--- sesman/tools/Makefile.orig	2007-09-24 22:22:56 +0400
+++ sesman/tools/Makefile	2007-09-24 22:24:31 +0400
@@ -14,7 +14,7 @@ DOCDIR = /usr/doc/xrdp
 DEFINES = -DLIBSCP_CLIENT
 
 CFLAGS = -Wall -O2 -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,. -lpthread -ldl -lscp
+LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,$(DESTDIR)
 C_OS_FLAGS = $(CFLAGS) -c
 LDADD = -ldl -lpthread -lscp
 CC = gcc

--- libxrdp/Makefile.orig	2007-04-09 01:19:42 +0400
+++ libxrdp/Makefile	2007-09-24 22:28:15 +0400
@@ -2,7 +2,7 @@
 LIBXRDPOBJ = libxrdp.o xrdp_tcp.o xrdp_iso.o xrdp_mcs.o \
              xrdp_sec.o xrdp_rdp.o xrdp_orders.o \
              xrdp_bitmap_compress.o xrdp_channel.o \
-             os_calls.o ssl_calls.o file.o
+             os_calls.o ssl_calls.o file.o ../common/list.o
 
 DESTDIR = /usr/local/xrdp
 CFGDIR = /etc/xrdp