Patch by Robert Scheck for zarafa >= 6.40.0, which only removes the paths from autoconf/automake related files, that don't exist in the OSS version of Zarafa. Having these paths not removed causes autoreconf to fail, but a re-run of autoreconf is needed in order to get the rpaths completely out of all the libraries and binaries built during the make process. forward patch by Mario Fetka diff -uNr zarafa-6.40.6,orig//ECtools/Makefile.am zarafa-6.40.6/ECtools/Makefile.am --- zarafa-6.40.6,orig//ECtools/Makefile.am 2011-03-20 08:34:03.000000000 +0100 +++ zarafa-6.40.6/ECtools/Makefile.am 2011-03-20 08:36:31.000000000 +0100 @@ -1,7 +1,3 @@ -if ! OSS_ONLY -PROSUBS = zarafa-backup zarafa-report -endif - if WITH_TESTTOOLS TESTSUBS = ECTestTools endif diff -uNr zarafa-6.40.6,orig//Makefile.am zarafa-6.40.6/Makefile.am --- zarafa-6.40.6,orig//Makefile.am 2011-03-20 08:34:03.000000000 +0100 +++ zarafa-6.40.6/Makefile.am 2011-03-20 08:35:57.000000000 +0100 @@ -1,10 +1,6 @@ AUTOMAKE_OPTIONS = 1.9 foreign ACLOCAL_AMFLAGS = -Iautoconf -if ! OSS_ONLY -PROSUBS = liblicense licensed -endif - SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext spooler gateway caldav ECtools installer po doc if WITH_SWIG @@ -26,10 +22,6 @@ common/ecversion.h: versionheader.sh sh ${top_srcdir}/versionheader.sh > common/ecversion.h -if ! OSS_ONLY -CLEANFILES=common/ecversion.h -endif - dist-hook: find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true if OSS_ONLY diff -uNr zarafa-6.40.6,orig//configure.ac zarafa-6.40.6/configure.ac --- zarafa-6.40.6,orig//configure.ac 2011-03-20 08:34:03.000000000 +0100 +++ zarafa-6.40.6/configure.ac 2011-03-20 08:35:16.000000000 +0100 @@ -808,17 +808,6 @@ version specialbuild ]) -dnl non-oss files -if test -d `dirname $0`/licensed; then -AC_CONFIG_FILES([ - liblicense/Makefile - licensed/Makefile - ECtools/zarafa-backup/Makefile - ECtools/zarafa-backup/helpers/Makefile - ECtools/zarafa-report/Makefile - debian/zarafa.install -]) -fi AC_OUTPUT