svn commit: r357541 - head/Mk

Antoine Brodin antoine at FreeBSD.org
Wed Jun 11 21:14:20 UTC 2014


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' \


More information about the svn-ports-head mailing list