more /opt/zimbra (apache-httpd, aspell, opendkim)

ThirdParty/apache-httpd/Makefile

@@ -18,9 +18,9 @@ files	:= $(wildcard src/httpd-$(HTTPD_VERSION).tar.bz2)
 aprsrc	:= $(wildcard src/apr-$(APR_VERSION).tar.bz2)
 aprutilsrc	:= $(wildcard src/apr-util-$(APR_UTIL_VERSION).tar.bz2)
 
-LDFLAGS	:=	LDFLAGS="-L/opt/zimbra/convertd/lib -R/opt/zimbra/convertd/lib -L/opt/zimbra/openssl-$(OPENSSL_VERSION)/lib -R/opt/zimbra/openssl-$(OPENSSL_VERSION)/lib"
+LDFLAGS	:=	LDFLAGS="-L$(ZIMBRA_HOME)/convertd/lib -R$(ZIMBRA_HOME)/convertd/lib -L$(ZIMBRA_HOME)/openssl-$(OPENSSL_VERSION)/lib -R$(ZIMBRA_HOME)/openssl-$(OPENSSL_VERSION)/lib"
 ifeq ($(BUILD_PLATFORM), UBUNTU12_64)
-LDFLAGS	:=	LDFLAGS="-L/opt/zimbra/convertd/lib -Wl,-rpath,/opt/zimbra/convertd/lib -L/opt/zimbra/openssl-$(OPENSSL_VERSION)/lib -Wl,-rpath,/opt/zimbra/openssl-$(OPENSSL_VERSION)/lib"
+LDFLAGS	:=	LDFLAGS="-L$(ZIMBRA_HOME)/convertd/lib -Wl,-rpath,$(ZIMBRA_HOME)/convertd/lib -L$(ZIMBRA_HOME)/openssl-$(OPENSSL_VERSION)/lib -Wl,-rpath,$(ZIMBRA_HOME)/openssl-$(OPENSSL_VERSION)/lib"
 endif
 
 all: checksrc allclean build check
@@ -40,7 +40,7 @@ build:
 	mv apr-$(APR_VERSION) apr;)
 	(cd httpd-$(HTTPD_VERSION)/srclib; tar xfj ../../src/apr-util-$(APR_UTIL_VERSION).tar.bz2; \
 	mv apr-util-$(APR_UTIL_VERSION) apr-util;)
-	(cd httpd-$(HTTPD_VERSION); $(ENVMOD) $(LDFLAGS) CFLAGS="-g -O2" ./configure --prefix=/opt/zimbra/httpd-$(HTTPD_VERSION) --enable-so --with-included-apr -with-mpm=event --enable-mpms-shared="all" --enable-ssl --with-ssl=/opt/zimbra/openssl-$(OPENSSL_VERSION); $(MAKE) $(MAKEARGS); $(MAKE) install)
+	(cd httpd-$(HTTPD_VERSION); $(ENVMOD) $(LDFLAGS) CFLAGS="-g -O2" ./configure --prefix=$(ZIMBRA_HOME)/httpd-$(HTTPD_VERSION) --enable-so --with-included-apr -with-mpm=event --enable-mpms-shared="all" --enable-ssl --with-ssl=$(ZIMBRA_HOME)/openssl-$(OPENSSL_VERSION); $(MAKE) $(MAKEARGS); $(MAKE) install)
 
 tar:
 	mkdir -p $(P4_ROOT)/ThirdPartyBuilds/$(BUILD_PLATFORM)/apache-httpd

ThirdParty/aspell/Makefile

@@ -45,7 +45,7 @@ checksrc:
 build:
 	tar xzf src/aspell-$(ASPELL_VERSION).tar.gz
 	(cd aspell-$(ASPELL_VERSION); \
-	./configure --prefix=/opt/zimbra/aspell-$(ASPELL_VERSION); $(MAKE) $(MAKEARGS))
+	./configure --prefix=$(ZIMBRA_HOME)/aspell-$(ASPELL_VERSION); $(MAKE) $(MAKEARGS))
 
 install:
 	(cd aspell-$(ASPELL_VERSION); $(MAKE) $(MAKEARGS) install)

ThirdParty/opendkim/Makefile

@@ -36,7 +36,7 @@ build:
 	$(PATCH) \
 	$(LDFLAGS) \
 	LD_LIBRARY_PATH=$(OPENSSL_LIB_DIR):$(CYRUS_LIB_DIR):$(LIBTOOL_LIB_DIR) \
-	ac_cv_path_SENDMAIL_PATH=/opt/zimbra/postfix/sbin/sendmail \
+	ac_cv_path_SENDMAIL_PATH=$(ZIMBRA_HOME)/postfix/sbin/sendmail \
 	CPPFLAGS="-I$(ZIMBRA_HOME)/libxml2/include/libxml2 -I$(ZIMBRA_HOME)/cyrus-sasl-$(CYRUS_VERSION)/include -I$(ZIMBRA_HOME)/libxml2/include -I$(ZIMBRA_HOME)/curl/include \
 		  -I$(ZIMBRA_HOME)/openssl-$(OPENSSL_VERSION)/include -I$(ZIMBRA_HOME)/libtool-$(LIBTOOL_VERSION)/include $(CPPFLAG)" \
 	CFLAGS="-g -O0" \
@@ -54,15 +54,15 @@ build:
 	--enable-default_sender \
 	--enable-rpath \
 	--enable-arlib \
-	--with-openssl=/opt/zimbra/openssl \
-	--with-milter=/opt/zimbra/sendmail \
-	--with-libmemcached=/opt/zimbra/libmemcached \
-	--with-openldap=/opt/zimbra/openldap \
-	--with-sasl=/opt/zimbra/cyrus-sasl \
-	--with-libcurl=/opt/zimbra/curl \
-	--with-mdb=/opt/zimbra/openldap \
+	--with-openssl=$(ZIMBRA_HOME)/openssl \
+	--with-milter=$(ZIMBRA_HOME)/sendmail \
+	--with-libmemcached=$(ZIMBRA_HOME)/libmemcached \
+	--with-openldap=$(ZIMBRA_HOME)/openldap \
+	--with-sasl=$(ZIMBRA_HOME)/cyrus-sasl \
+	--with-libcurl=$(ZIMBRA_HOME)/curl \
+	--with-mdb=$(ZIMBRA_HOME)/openldap \
 	--without-db \
-	--with-libxml2=/opt/zimbra/libxml2; \
+	--with-libxml2=$(ZIMBRA_HOME)/libxml2; \
 	LD_RUN_PATH=$(OPENSSL_LIB_DIR):$(CYRUS_LIB_DIR):$(LIBTOOL_LIB_DIR) $(MAKE) $(MAKEARGS); \
 	LD_RUN_PATH=$(OPENSSL_LIB_DIR):$(CYRUS_LIB_DIR):$(LIBTOOL_LIB_DIR) $(MAKE) install STRIP="";)
 	(cd $(ZIMBRA_HOME); ln -s opendkim-$(DKIM_VERSION) opendkim)