[Midnightbsd-cvs] mports: bsd.mport.mk: Don't automatically add infodir or mandir to

[ctriv at midnightbsd.org]

Log Message:
-----------
Don't automatically add infodir or mandir to CONFIGURE_ARGS if
CONFIGURE_ARGS already has the relevent variable.  This fixes the bug with
lang/gcc42.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.58 -> r1.59)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.58
retrieving revision 1.59
diff -LMk/bsd.mport.mk -LMk/bsd.mport.mk -u -r1.58 -r1.59
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -2712,10 +2712,10 @@
 INTUIT_LATE_CONFIGURE_ARGS= \
 	_LATE_CONFIGURE_ARGS=""; \
 	_configure_help="`./${CONFIGURE_SCRIPT} --help 2>&1`"; \
-	if ${ECHO_CMD} $$_configure_help | ${GREP} -- '--mandir' >/dev/null; then \
+	if ${ECHO_CMD} $$_configure_help | ${GREP} -- '--mandir' >/dev/null  && !(${ECHO_CMD} ${CONFIGURE_ARGS} | ${GREP} -- '--mandir' >/dev/null); then \
 		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${MANPREFIX}/man"; \
 	fi ;\
-	if ${ECHO_CMD} $$_configure_help | ${GREP} -- '--infodir' >/dev/null; then \
+	if ${ECHO_CMD} $$_configure_help | ${GREP} -- '--infodir' >/dev/null && !(${ECHO_CMD} ${CONFIGURE_ARGS} | ${GREP} -- '--infodir' >/dev/null); then \
 		_LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${PREFIX}/${INFO_PATH}"; \
 	fi ;
 .endif