From 23c2ad986cc49cdb15f6d75e5aec0a48d511bc4c Mon Sep 17 00:00:00 2001
From: Erwin Lansing <erwin@FreeBSD.org>
Date: Fri, 29 Oct 2010 12:41:29 +0000
Subject: Fix a mismerge in the previous revision and revert the reversion of
 revision 1.651.

Noticed by:	sunpoet
---
 Mk/bsd.port.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 26775d04176c..a2c931dddb8c 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2276,7 +2276,8 @@ MAKEFILE?=		Makefile
 MAKE_ENV+=		PREFIX=${PREFIX} \
 			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
 			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \
-			CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+			CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
+			CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 			MANPREFIX="${MANPREFIX}"
 
 # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher.
@@ -3781,7 +3782,7 @@ do-configure:
 .if defined(HAS_CONFIGURE)
 	@(cd ${CONFIGURE_WRKSRC} && \
 	    ${SET_LATE_CONFIGURE_ARGS} \
-		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
+		if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
 	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
 	    INSTALL_DATA="${INSTALL_DATA}" \
@@ -5374,7 +5375,7 @@ FETCH_LIST?=	for i in $$deps; do \
 				continue;	\
 			fi;;	\
 		esac;	\
-		echo cd $$dir; ${MAKE} $$targ; \
+		echo cd $$dir; cd $$dir; ${MAKE} $$targ; \
 	done
 
 .if !target(fetch-required)
-- 
cgit v1.2.3