diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-06-08 21:25:54 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-06-08 21:25:54 +0000 |
| commit | 047b1c8ff7f38db02e0eae70e26100894ab774c0 (patch) | |
| tree | d04cc7ef7d91efe7f6de44ebe4128254b24051ac /Mk | |
| parent | a63bcd185577a4811d83db1767792867b00f827a (diff) | |
| download | ports-047b1c8ff7f38db02e0eae70e26100894ab774c0.tar.gz ports-047b1c8ff7f38db02e0eae70e26100894ab774c0.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 81d3fb708ac7..df5f7a3460bd 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -970,12 +970,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - Same as USE_LDCONFIG but the target file is # ${PREFIX}/libdata/ldconfig32/${UNIQUENAME} instead. # Note: that should only be used on 64-bit architectures. -# NO_LDCONFIG_MTREE -# - Denotes whether the libdata/ldconfig directory is part of -# the mtree on a given OSVERSION system. If it is not, we -# create the directory, pull in the ldconfig_compat port, -# and clean up on de-installation. NOTE: this variable is -# internal to bsd.port.mk and must not be set in your Makefile. # # DOCSDIR - Name of the directory to install the packages docs in. # Default: ${PREFIX}/share/doc/${PORTNAME} @@ -4022,18 +4016,15 @@ install-ldconfig-file: -${LDCONFIG} -m ${USE_LDCONFIG} .endif .endif -.if ${USE_LDCONFIG} != "${PREFIX}/lib" && !defined(INSTALL_AS_USER) +.if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing ldconfig configuration file" -.if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR} +.if defined(NO_MTREE) + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} + @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} -.if defined(NO_LDCONFIG_MTREE) - @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" >> ${TMPPLIST} -.endif .endif .endif .endif @@ -4049,16 +4040,13 @@ install-ldconfig-file: .endif .if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" -.if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${STAGEDIR}${PREFIX}/${LDCONFIG_32DIR} +.if defined(NO_MTREE) + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_32DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ - > ${STAGEDIR}${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} + @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} -.if defined(NO_LDCONFIG_MTREE) - @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST} -.endif .endif .endif .if defined(INSTALLS_SHLIB) |