diff -u -r xrdp/docs/Makefile xrdp-0.3.2/docs/Makefile
--- xrdp-0.3.2/docs/Makefile	2006-03-04 04:02:02 +0300
+++ xrdp-0.3.2/docs/Makefile	2007-01-16 15:08:45 +0300
@@ -12,8 +12,8 @@
 install:
 
 installdeb:
-	install man/sesman.8 $(DESTDIRDEB)/usr/man/man8/sesman.8
-	install man/sesrun.8 $(DESTDIRDEB)/usr/man/man8/sesrun.8
-	install man/xrdp.8 $(DESTDIRDEB)/usr/man/man8/xrdp.8
-	install man/sesman.ini.5 $(DESTDIRDEB)/usr/man/man5/sesman.ini.5
-	install man/xrdp.ini.5 $(DESTDIRDEB)/usr/man/man5/xrdp.ini.5
+	install man/sesman.8 $(DESTDIRDEB)/usr/share/man/man8/sesman.8
+	install man/sesrun.8 $(DESTDIRDEB)/usr/share/man/man8/sesrun.8
+	install man/xrdp.8 $(DESTDIRDEB)/usr/share/man/man8/xrdp.8
+	install man/sesman.ini.5 $(DESTDIRDEB)/usr/share/man/man5/sesman.ini.5
+	install man/xrdp.ini.5 $(DESTDIRDEB)/usr/share/man/man5/xrdp.ini.5
diff -u -r xrdp/libxrdp/Makefile xrdp-0.3.2/libxrdp/Makefile
--- xrdp-0.3.2/libxrdp/Makefile	2006-03-13 03:58:12 +0300
+++ xrdp-0.3.2/libxrdp/Makefile	2007-01-17 14:03:29 +0300
@@ -2,12 +2,12 @@
 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 \
-             os_calls.o ssl_calls.o file.o
+             os_calls.o ssl_calls.o file.o list.o
 
 DESTDIR = /usr/local/xrdp
 CFGDIR = /etc/xrdp
 PIDDIR = /var/run
-MANDIR = /usr/local/man
+MANDIR = /usr/share/man
 DOCDIR = /usr/doc/xrdp
 
 DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
@@ -38,7 +38,10 @@
 	install libxrdp.so $(DESTDIR)/libxrdp.so
 
 installdeb:
-	install libxrdp.so $(DESTDIRDEB)/usr/xrdp/libxrdp.so
+	install libxrdp.so $(DESTDIRDEB)/usr/lib/xrdp/libxrdp.so
+
+list.o: ../common/list.c
+	$(CC) $(C_OS_FLAGS) ../common/list.c
 
 file.o: ../common/file.c
 	$(CC) $(C_OS_FLAGS) ../common/file.c
diff -u -r xrdp/Makefile xrdp-0.3.2/Makefile
--- xrdp-0.3.2/Makefile	2006-03-04 04:02:01 +0300
+++ xrdp-0.3.2/Makefile	2007-01-17 16:31:30 +0300
@@ -51,13 +51,16 @@
 	install instfiles/xrdp_control.sh $(DESTDIR)/xrdp_control.sh
 
 installdeb:
-	mkdir -p $(DESTDIRDEB)/usr/xrdp
+	mkdir -p $(DESTDIRDEB)/usr/bin
+	mkdir -p $(DESTDIRDEB)/usr/share/xrdp
+	mkdir -p $(DESTDIRDEB)/usr/lib
+	mkdir -p $(DESTDIRDEB)/usr/lib/xrdp
 	mkdir -p $(DESTDIRDEB)/etc/xrdp
 	mkdir -p $(DESTDIRDEB)/etc/pam.d
-	mkdir -p $(DESTDIRDEB)/etc/init.d
-	mkdir -p $(DESTDIRDEB)/usr/man
-	mkdir -p $(DESTDIRDEB)/usr/man/man5
-	mkdir -p $(DESTDIRDEB)/usr/man/man8
+#	mkdir -p $(DESTDIRDEB)/etc/init.d
+	mkdir -p $(DESTDIRDEB)/usr/share/man
+	mkdir -p $(DESTDIRDEB)/usr/share/man/man5
+	mkdir -p $(DESTDIRDEB)/usr/share/man/man8
 	make -C vnc installdeb DESTDIRDEB=$(DESTDIRDEB)
 	make -C libxrdp installdeb DESTDIRDEB=$(DESTDIRDEB)
 	make -C xrdp installdeb DESTDIRDEB=$(DESTDIRDEB)
@@ -66,4 +69,4 @@
 	make -C xup installdeb DESTDIRDEB=$(DESTDIRDEB)
 	make -C docs installdeb DESTDIRDEB=$(DESTDIRDEB)
 	install instfiles/pam.d/sesman $(DESTDIRDEB)/etc/pam.d/sesman
-	install instfiles/xrdp_control1.sh $(DESTDIRDEB)/etc/init.d/xrdp_control.sh
+#	install instfiles/xrdp_control.sh $(DESTDIRDEB)/etc/init.d/xrdp_control.sh
diff -u -r xrdp/rdp/Makefile xrdp-0.3.2/rdp/Makefile
--- xrdp-0.3.2/rdp/Makefile	2006-03-04 04:02:04 +0300
+++ xrdp-0.3.2/rdp/Makefile	2007-01-17 14:03:23 +0300
@@ -36,4 +36,4 @@
 	install librdp.so $(DESTDIR)/librdp.so
 
 installdeb:
-	install librdp.so $(DESTDIRDEB)/usr/xrdp/librdp.so
+	install librdp.so $(DESTDIRDEB)/usr/lib/xrdp/librdp.so
diff -u -r xrdp/sesman/Makefile xrdp-0.3.2/sesman/Makefile
--- xrdp-0.3.2/sesman/Makefile	2006-05-26 17:10:14 +0400
+++ xrdp-0.3.2/sesman/Makefile	2007-01-16 17:40:04 +0300
@@ -52,9 +52,9 @@
 	install sesman.ini $(CFGDIR)/sesman.ini
 
 installdeb:
-	install sesman $(DESTDIRDEB)/usr/xrdp/sesman
-	install sesrun $(DESTDIRDEB)/usr/xrdp/sesrun
-	install startwm.sh $(DESTDIRDEB)/usr/xrdp/startwm.sh
+	install sesman $(DESTDIRDEB)/usr/bin/sesman
+	install sesrun $(DESTDIRDEB)/usr/bin/sesrun
+	install startwm.sh $(DESTDIRDEB)/usr/bin/startwm.sh
 	install sesman.ini $(DESTDIRDEB)/etc/xrdp/sesman.ini
 
 os_calls.o: ../common/os_calls.c
diff -u -r xrdp/vnc/Makefile xrdp-0.3.2/vnc/Makefile
--- xrdp-0.3.2/vnc/Makefile	2006-03-04 04:02:06 +0300
+++ xrdp-0.3.2/vnc/Makefile	2007-01-17 14:03:09 +0300
@@ -33,4 +33,4 @@
 	install libvnc.so $(DESTDIR)/libvnc.so
 
 installdeb:
-	install libvnc.so $(DESTDIRDEB)/usr/xrdp/libvnc.so
+	install libvnc.so $(DESTDIRDEB)/usr/lib/xrdp/libvnc.so
diff -u -r xrdp/xrdp/Makefile xrdp-0.3.2/xrdp/Makefile
--- xrdp-0.3.2/xrdp/Makefile	2006-03-04 04:02:08 +0300
+++ xrdp-0.3.2/xrdp/Makefile	2007-01-17 14:04:22 +0300
@@ -17,7 +17,7 @@
 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,/usr/lib/xrdp/
 LIBS = -ldl -lpthread -lxrdp
 CC = gcc
 
@@ -41,14 +41,14 @@
 	install xrdp $(DESTDIR)/xrdp
 
 installdeb:
-	install ad256.bmp $(DESTDIRDEB)/usr/xrdp/ad256.bmp
-	install xrdp256.bmp $(DESTDIRDEB)/usr/xrdp/xrdp256.bmp
-	install cursor0.cur $(DESTDIRDEB)/usr/xrdp/cursor0.cur
-	install cursor1.cur $(DESTDIRDEB)/usr/xrdp/cursor1.cur
-	install Tahoma-10.fv1 $(DESTDIRDEB)/usr/xrdp/Tahoma-10.fv1
+	install ad256.bmp $(DESTDIRDEB)/usr/share/xrdp/ad256.bmp
+	install xrdp256.bmp $(DESTDIRDEB)/usr/share/xrdp/xrdp256.bmp
+	install cursor0.cur $(DESTDIRDEB)/usr/share/xrdp/cursor0.cur
+	install cursor1.cur $(DESTDIRDEB)/usr/share/xrdp/cursor1.cur
+	install Tahoma-10.fv1 $(DESTDIRDEB)/usr/share/xrdp/Tahoma-10.fv1
 	install xrdp.ini $(DESTDIRDEB)/etc/xrdp/xrdp.ini
 	install rsakeys.ini $(DESTDIRDEB)/etc/xrdp/rsakeys.ini
-	install xrdp $(DESTDIRDEB)/usr/xrdp/xrdp
+	install xrdp $(DESTDIRDEB)/usr/bin/xrdp
 
 list.o: ../common/list.c
 	$(CC) $(C_OS_FLAGS) ../common/list.c
diff -u -r xrdp/xrdp/xrdp_font.c xrdp-0.3.2/xrdp/xrdp_font.c
--- xrdp-0.3.2/xrdp/xrdp_font.c	2006-04-16 06:20:20 +0400
+++ xrdp-0.3.2/xrdp/xrdp_font.c	2007-01-16 17:09:26 +0300
@@ -79,7 +79,7 @@
   self->wm = wm;
   make_stream(s);
   init_stream(s, 8192);
-  fd = g_file_open("Tahoma-10.fv1");
+  fd = g_file_open("/usr/share/xrdp/Tahoma-10.fv1");
   if (fd != -1)
   {
     b = g_file_read(fd, s->data, 8192);
diff -u -r xrdp/xrdp/xrdp_login_wnd.c xrdp-0.3.2/xrdp/xrdp_login_wnd.c
--- xrdp-0.3.2/xrdp/xrdp_login_wnd.c	2006-04-29 05:47:06 +0400
+++ xrdp-0.3.2/xrdp/xrdp_login_wnd.c	2007-01-16 17:07:04 +0300
@@ -645,7 +645,7 @@
 
   /* image */
   but = xrdp_bitmap_create(4, 4, self->screen->bpp, WND_TYPE_IMAGE, self);
-  xrdp_bitmap_load(but, "xrdp256.bmp", self->palette);
+  xrdp_bitmap_load(but, "/usr/share/xrdp/xrdp256.bmp", self->palette);
   but->parent = self->screen;
   but->owner = self->screen;
   but->left = self->screen->width - but->width;
@@ -654,7 +654,7 @@
 
   /* image */
   but = xrdp_bitmap_create(4, 4, self->screen->bpp, WND_TYPE_IMAGE, self);
-  xrdp_bitmap_load(but, "ad256.bmp", self->palette);
+  xrdp_bitmap_load(but, "/usr/share/xrdp/ad256.bmp", self->palette);
   but->parent = self->login_window;
   but->owner = self->login_window;
   but->left = 10;
diff -u -r xrdp/xrdp/xrdp_wm.c xrdp-0.3.2/xrdp/xrdp_wm.c
--- xrdp-0.3.2/xrdp/xrdp_wm.c	2006-04-29 05:47:06 +0400
+++ xrdp-0.3.2/xrdp/xrdp_wm.c	2007-01-16 17:08:34 +0300
@@ -343,11 +343,11 @@
   struct xrdp_pointer_item pointer_item;
 
   DEBUG(("sending cursor"));
-  xrdp_wm_load_pointer(self, "cursor1.cur", pointer_item.data,
+  xrdp_wm_load_pointer(self, "/usr/share/xrdp/cursor1.cur", pointer_item.data,
                        pointer_item.mask, &pointer_item.x, &pointer_item.y);
   xrdp_cache_add_pointer_static(self->cache, &pointer_item, 1);
   DEBUG(("sending cursor"));
-  xrdp_wm_load_pointer(self, "cursor0.cur", pointer_item.data,
+  xrdp_wm_load_pointer(self, "/usr/share/xrdp/cursor0.cur", pointer_item.data,
                        pointer_item.mask, &pointer_item.x, &pointer_item.y);
   xrdp_cache_add_pointer_static(self->cache, &pointer_item, 0);
   return 0;
diff -u -r xrdp/xup/Makefile xrdp-0.3.2/xup/Makefile
--- xrdp-0.3.2/xup/Makefile	2006-03-04 04:02:09 +0300
+++ xrdp-0.3.2/xup/Makefile	2007-01-17 14:02:53 +0300
@@ -31,4 +31,4 @@
 	install libxup.so $(DESTDIR)/libxup.so
 
 installdeb:
-	install libxup.so $(DESTDIRDEB)/usr/xrdp/libxup.so
+	install libxup.so $(DESTDIRDEB)/usr/lib/xrdp/libxup.so
