Date: Wed, 11 Jun 2014 21:14:20 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357541 - head/Mk Message-ID: <201406112114.s5BLEKla003569@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Jun 11 21:14:19 2014 New Revision: 357541 URL: http://svnweb.freebsd.org/changeset/ports/357541 QAT: https://qat.redports.org/buildarchive/r357541/ Log: Fix USE_LDCONFIG when PREFIX!=LOCALBASE and there is no NO_MTREE Reported by: gerald Reviewed by: bapt Phabric: D209 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Jun 11 21:11:39 2014 (r357540) +++ head/Mk/bsd.port.mk Wed Jun 11 21:14:19 2014 (r357541) @@ -4018,7 +4018,7 @@ install-ldconfig-file: .endif .if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing ldconfig configuration file" -.if defined(NO_MTREE) +.if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE} @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ @@ -4040,7 +4040,7 @@ install-ldconfig-file: .endif .if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" -.if defined(NO_MTREE) +.if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE} @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_32DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406112114.s5BLEKla003569>