do not set /opt/zimbra as default for ZIMBRA_HOME

ThirdParty/Perl/Makefile

@@ -4,7 +4,6 @@
 SHELL	:= /bin/bash
 PERL_ROOT ?= $(shell pwd)
 P4_ROOT ?= $(shell cd $(PERL_ROOT)/../..; pwd)
-ZIMBRA_HOME ?= /opt/zimbra
 JAVA_HOME		:= /usr/local/java
 export JAVA_HOME
 TMPDIR	:= tmp

ThirdParty/altermime/Makefile

@@ -4,7 +4,6 @@ MAKE ?= make
 MAKEARGS ?= -j2
 
 BUILD_PLATFORM ?= $(shell sh $(P4_ROOT)/ZimbraBuild/rpmconf/Build/get_plat_tag.sh)
-ZIMBRA_HOME ?= /opt/zimbra
 
 ifdef BETA
 	include $(ALTMIME_ROOT)/../beta_versions.def

ThirdParty/apache-httpd/Makefile

@@ -5,7 +5,6 @@ MAKEARGS ?= -j2
 
 BUILD_PLATFORM ?= $(shell sh $(P4_ROOT)/ZimbraBuild/rpmconf/Build/get_plat_tag.sh)
 
-ZIMBRA_HOME ?= /opt/zimbra
 ifdef BETA
 	include $(HTTPD_ROOT)/../beta_versions.def
 else

ThirdParty/aspell/Makefile

@@ -10,8 +10,6 @@ ifeq ($(BUILD_PLATFORM), )
         BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(ASPELL_ROOT)/../beta_versions.def
 else

ThirdParty/bdb/Makefile

@@ -9,8 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(BDB_ROOT)/../beta_versions.def
 else

ThirdParty/clamav/Makefile

@@ -9,8 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 PATCH	:= patch -N -g0 -p1 < ../patches/fix-configure-963.patch
 CONFIG_OPT	:=
 CPPFLAGS 	:=

ThirdParty/curl/Makefile

@@ -6,8 +6,6 @@ SED ?= sed
 
 BUILD_PLATFORM ?= $(shell sh $(P4_ROOT)/ZimbraBuild/rpmconf/Build/get_plat_tag.sh)
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(CURL_ROOT)/../beta_versions.def
 	PATCH	:= patch -N -g0 -p1 < ../patches/krb5-7200.patch; patch -N -g0 -p1 < ../patches/lwp-fix.patch;

ThirdParty/cyrus-sasl/Makefile

@@ -9,8 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 PATCH	:=
 
 ifdef BETA

ThirdParty/dspam/Makefile

@@ -9,8 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(DSPAM_ROOT)/../beta_versions.def
 else

ThirdParty/heimdal/Makefile

@@ -9,8 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(HEIMDAL_ROOT)/../beta_versions.def
 else

ThirdParty/libmemcached/Makefile

@@ -9,7 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 endif
 
 MAKEARGS ?= -j2
-ZIMBRA_HOME ?= /opt/zimbra
 
 PATCH	:=
 

ThirdParty/libtool/Makefile

@@ -9,8 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(LIBTOOL_ROOT)/../beta_versions.def
 else

ThirdParty/libxml2/Makefile

@@ -4,7 +4,6 @@ MAKE ?= make
 MAKEARGS ?= -j2
 
 BUILD_PLATFORM ?= $(shell sh $(P4_ROOT)/ZimbraBuild/rpmconf/Build/get_plat_tag.sh)
-ZIMBRA_HOME ?= /opt/zimbra
 
 ifdef BETA
 	include $(XML_ROOT)/../beta_versions.def

ThirdParty/memcached/Makefile

@@ -7,8 +7,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 PATCH	:=
 
 ifdef BETA

ThirdParty/mysql/Makefile

@@ -10,8 +10,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(MYSQL_ROOT)/../beta_versions.def
 	PATCH   := patch -g0 -N -p1 < ../patches/openssl.patch; patch -g0 -N -p1 < ../patches/apple-runpath.patch;

ThirdParty/nginx/Makefile

@@ -7,8 +7,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(NGINX_ROOT)/../beta_versions.def
 else

ThirdParty/opendkim/Makefile

@@ -9,7 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 endif
 
 MAKEARGS ?= -j2
-ZIMBRA_HOME ?= /opt/zimbra
 
 PATCH	:=
 

ThirdParty/openldap/Makefile

@@ -10,7 +10,6 @@ endif
 
 #MAKEARGS ?= -j2 DEFINES="-DCHECK_CSN -DSLAP_SCHEMA_EXPOSE -DMDB_DEBUG=3"
 MAKEARGS ?= -j2 DEFINES="-DCHECK_CSN -DSLAP_SCHEMA_EXPOSE"
-ZIMBRA_HOME ?= /opt/zimbra
 
 PATCH	:= patch -g0 -N -p1 < ../patches/ITS7536.patch; patch -g0 -N -p1 < ../patches/ITS7542.patch; patch -g0 -N -p1 < ../patches/ITS7540.patch;
 

ThirdParty/openssl/Makefile

@@ -9,8 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(OPENSSL_ROOT)/../beta_versions.def
 else

ThirdParty/php/Makefile

@@ -9,8 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 PATCH	:=
 ifdef BETA
 	include $(PHP_ROOT)/../beta_versions.def

ThirdParty/postfix/Makefile

@@ -7,8 +7,6 @@ MAKEARGS ?= -j2
 
 BUILD_PLATFORM ?= $(shell sh $(P4_ROOT)/ZimbraBuild/rpmconf/Build/get_plat_tag.sh)
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 PATCH	:=
 ifdef BETA
 	include $(POSTFIX_ROOT)/../beta_versions.def

ThirdParty/rrdtool/Makefile

@@ -4,7 +4,6 @@ MAKE ?= make
 MAKEARGS ?= -j2
 
 BUILD_PLATFORM ?= $(shell sh $(P4_ROOT)/ZimbraBuild/rpmconf/Build/get_plat_tag.sh)
-ZIMBRA_HOME ?= /opt/zimbra
 
 ifdef BETA
 	include $(RRDTOOL_ROOT)/../beta_versions.def

ThirdParty/rsync/Makefile

@@ -4,7 +4,6 @@ MAKE ?= make
 MAKEARGS ?= -j2
 
 BUILD_PLATFORM ?= $(shell sh $(P4_ROOT)/ZimbraBuild/rpmconf/Build/get_plat_tag.sh)
-ZIMBRA_HOME ?= /opt/zimbra
 
 ifdef BETA
 	include $(RSYNC_ROOT)/../beta_versions.def

ThirdParty/sendmail/Makefile

@@ -7,8 +7,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 PATCH   := patch -g0 -N -p1 < ../patches/ipv6.patch;
 
 ifdef BETA

ThirdParty/snmp/Makefile

@@ -4,7 +4,6 @@ MAKE ?= make
 MAKEARGS ?= -j2
 
 BUILD_PLATFORM ?= $(shell sh $(P4_ROOT)/ZimbraBuild/rpmconf/Build/get_plat_tag.sh)
-ZIMBRA_HOME ?= /opt/zimbra
 
 ifdef BETA
 	include $(SNMP_ROOT)/../beta_versions.def

ThirdParty/tcmalloc/Makefile

@@ -7,8 +7,6 @@ ifeq ($(BUILD_PLATFORM), )
 	BUILD_PLATFORM := "UNKNOWN"
 endif
 
-ZIMBRA_HOME ?= /opt/zimbra
-
 ifdef BETA
 	include $(TCMALLOC_ROOT)/../beta_versions.def
 else

ThirdParty/zeromq/Makefile

@@ -9,7 +9,6 @@ ifeq ($(BUILD_PLATFORM), )
 endif
 
 MAKEARGS ?= -j2
-ZIMBRA_HOME ?= /opt/zimbra
 
 PATCH	:=