63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
Patch by Robert Scheck <robert@fedoraproject.org> 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 <mario.fetka@gmail.com>
|
|
|
|
diff -uNr zarafa-7.0.0.orig//ECtools/Makefile.am zarafa-7.0.0/ECtools/Makefile.am
|
|
--- zarafa-7.0.0.orig//ECtools/Makefile.am 2011-07-26 02:33:33.778000103 +0200
|
|
+++ zarafa-7.0.0/ECtools/Makefile.am 2011-07-26 02:34:25.198000081 +0200
|
|
@@ -1,5 +1 @@
|
|
-if ! OSS_ONLY
|
|
-PROSUBS = zarafa-backup zarafa-report zarafa-msr za-extra
|
|
-endif
|
|
-
|
|
SUBDIRS = $(PROSUBS) zarafa-archiver zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-indexer
|
|
diff -uNr zarafa-7.0.0.orig//Makefile.am zarafa-7.0.0/Makefile.am
|
|
--- zarafa-7.0.0.orig//Makefile.am 2011-07-26 02:33:33.804000103 +0200
|
|
+++ zarafa-7.0.0/Makefile.am 2011-07-26 02:34:14.491000119 +0200
|
|
@@ -1,8 +1,5 @@
|
|
ACLOCAL_AMFLAGS = -I autoconf
|
|
|
|
-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
|
|
|
|
@@ -33,10 +30,6 @@
|
|
# we force a clean, since if it's not clean, something will loop and eat up gigabytes of diskspace
|
|
(cd webapp && ant clean && ant && ant deploy)
|
|
|
|
-if ! OSS_ONLY
|
|
-CLEANFILES=common/ecversion.h
|
|
-endif
|
|
-
|
|
dist-hook: webapp/deploy
|
|
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
|
if OSS_ONLY
|
|
diff -uNr zarafa-7.0.0.orig//configure.ac zarafa-7.0.0/configure.ac
|
|
--- zarafa-7.0.0.orig//configure.ac 2011-07-26 02:33:33.852000103 +0200
|
|
+++ zarafa-7.0.0/configure.ac 2011-07-26 02:37:56.348000127 +0200
|
|
@@ -748,18 +748,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
|
|
- ECtools/zarafa-msr/Makefile
|
|
- ECtools/za-extra/Makefile
|
|
-])
|
|
-fi
|
|
|
|
AC_OUTPUT
|
|
|