54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
|
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-03-22 07:04:14.000000000 +0100
|
||
|
|
+++ zarafa-7.0.0/ECtools/Makefile.am 2011-03-22 07:04:34.000000000 +0100
|
||
|
|
@@ -1,5 +1,2 @@
|
||
|
|
-if ! OSS_ONLY
|
||
|
|
-PROSUBS = zarafa-backup zarafa-report
|
||
|
|
-endif
|
||
|
|
|
||
|
|
SUBDIRS = $(PROSUBS) zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-archiver 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-03-22 07:04:14.000000000 +0100
|
||
|
|
+++ zarafa-7.0.0/Makefile.am 2011-03-22 07:05:00.000000000 +0100
|
||
|
|
@@ -1,9 +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
|
||
|
|
|
||
|
|
if WITH_SWIG
|
||
|
|
@@ -33,10 +29,6 @@
|
||
|
|
# we force a clean, since if it's not clean, something will loop and eat up gigabytes of diskspace
|
||
|
|
(cd webaccess && ant clean && ant && ant deploy)
|
||
|
|
|
||
|
|
-if ! OSS_ONLY
|
||
|
|
-CLEANFILES=common/ecversion.h
|
||
|
|
-endif
|
||
|
|
-
|
||
|
|
dist-hook: webaccess/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-03-22 07:04:14.000000000 +0100
|
||
|
|
+++ zarafa-7.0.0/configure.ac 2011-03-22 07:06:06.000000000 +0100
|
||
|
|
@@ -737,16 +737,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
|
||
|
|
-])
|
||
|
|
-fi
|
||
|
|
|
||
|
|
AC_OUTPUT
|
||
|
|
|