--- rsync-3.0.6.orig/Makefile.in	2009-04-11 01:24:49.000000000 +0200
+++ rsync-3.0.6/Makefile.in	2009-10-16 21:08:34.000000000 +0200
@@ -6,6 +6,8 @@ datarootdir=@datarootdir@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
 mandir=@mandir@
+libdir=@libdir@
+includedir=@includedir@
 
 LIBS=@LIBS@
 CC=@CC@
@@ -40,10 +42,15 @@ OBJS3=progress.o pipe.o
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
 popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
 	popt/popthelp.o popt/poptparse.o
-OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_POPT@
 
 TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
 
+$(ZLIBOBJ) : CFLAGS += -fPIC
+ZLIBNAME=rsync-zlib
+ZLIB=lib$(ZLIBNAME).so
+ZLIB_V=$(ZLIB).1
+
 # Programs we must have to run the test cases
 CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
 	trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT)
@@ -62,6 +69,10 @@ CHECK_OBJS=tls.o getgroups.o getfsdev.o 
 all: Makefile rsync$(EXEEXT) @MAKE_MAN@
 
 install: all
+	-mkdir -p ${DESTDIR}${libdir}
+	${INSTALLCMD} ${INSTALL_STRIP} -m 755 $(ZLIB) $(ZLIB_V) ${DESTDIR}${libdir}
+	-mkdir -p ${DESTDIR}${includedir}/$(ZLIBNAME)
+	${INSTALLCMD} -m 644 zlib/{zlib.h,zconf.h} ${DESTDIR}${includedir}/$(ZLIBNAME)
 	-mkdir -p ${DESTDIR}${bindir}
 	${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
 	-mkdir -p ${DESTDIR}${mandir}/man1
@@ -72,8 +83,14 @@ install: all
 install-strip:
 	$(MAKE) INSTALL_STRIP='-s' install
 
-rsync$(EXEEXT): $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+rsync$(EXEEXT): $(OBJS) $(ZLIB)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(ZLIB)
+
+$(ZLIB_V): $(ZLIBOBJ)
+	$(CC) -o $@ -shared -Wl,--soname,$(ZLIB_V) $(ZLIBOBJ)
+
+$(ZLIB): $(ZLIB_V)
+	ln -sf $(ZLIB_V) $(ZLIB)
 
 $(OBJS): $(HEADERS)
 $(CHECK_OBJS): $(HEADERS)
@@ -190,7 +207,7 @@ rsyncd.conf.5: rsyncd.conf.yo
 	-$(srcdir)/tweak_manpage rsyncd.conf.5
 
 clean: cleantests
-	rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
+	rm -f *~ $(OBJS) $(ZLIBOBJ) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) \
 		rounding rounding.h *.old
 
 cleantests: