From 03d42e481ca0cca38d4b043f94db61bb8cab6bb6 Mon Sep 17 00:00:00 2001
From: Clement Laforet <clement@FreeBSD.org>
Date: Sun, 4 Dec 2005 17:13:42 +0000
Subject: - export APACHEMODDIR and APACHEINCLUDEDIR to Makefile-land - remove
 duplicated "code"

---
 Mk/bsd.apache.mk | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'Mk/bsd.apache.mk')

diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index e1e66904e1aa..efdae066a0d5 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -289,23 +289,26 @@ IGNORE?=	PREFIX must be egal to APXS_PREFIX.
 .   endif
 .endif
 
-.if ${APACHE_VERSION} == "20"
+.if ${APACHE_VERSION} == 20
 AP_BUILDEXT=	la
-PLIST_SUB+=	APACHEMODDIR="libexec/apache2" \
-			APACHEINCLUDEDIR="include/apache2"
+APACHEMODDIR=	libexec/apache2
+APACHEINCLUDEDIR=include/apache2
 APACHE_PORT=	www/apache${APACHE_VERSION}
 .elif ${APACHE_VERSION} >= 21
 AP_BUILDEXT=	la
-PLIST_SUB+=	APACHEMODDIR="libexec/apache${APACHE_VERSION}" \
-			APACHEINCLUDEDIR="include/apache${APACHE_VERSION}"
+APACHEMODDIR=	libexec/apache${APACHE_VERSION}
+APACHEINCLUDEDIR=include/apache${APACHE_VERSION}
 APACHE_PORT=	www/apache${APACHE_VERSION}
 .else
 AP_BUILDEXT=	so
-PLIST_SUB+=	APACHEMODDIR="libexec/apache" \
-			APACHEINCLUDEDIR="include/apache"
+APACHEMODDIR=	libexec/apache
+APACHEINCLUDEDIR=include/apache
 APACHE_PORT?= www/apache13
 .endif
 
+PLIST_SUB+=	APACHEMODDIR="${APACHEMODDIR}" \
+		APACHEINCLUDEDIR="${APACHEINCLUDEDIR}"
+
 .for VAR in ${OVERRIDABLE_VARS}
 .  if defined(AP${APACHE_VERSION}_${VAR})
 ${VAR} =${AP${APACHE_VERSION}_${VAR}}
-- 
cgit v1.2.3