diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-07-29 17:38:19 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-07-29 17:38:19 +0000 |
| commit | 6e5fd411df042b56be09e3e3c0be0c720f1bd7ee (patch) | |
| tree | 8400bbf6da19c9b4351da122122cf59f569fd698 /Mk/bsd.port.mk | |
| parent | c136dca77930cff8f6d9dd93ac5a0ea01b9eba5c (diff) | |
| download | ports-6e5fd411df042b56be09e3e3c0be0c720f1bd7ee.tar.gz ports-6e5fd411df042b56be09e3e3c0be0c720f1bd7ee.zip | |
- Reset @cwd to prefix after creating ldconfig configuration file in localbase
- Reset @cwd to prefix before listing info pages (same as is done for PORTDOCS,
PORTEXAMPLES and PORTDATA)
- Fix a typo from 2006, LDCONFIG_32DIR instead of LDCONFIG32_DIR
Reported by: John Hein
Phabric: D493
Reviewed by: bapt
Exp-run: self
With hat: portmgr
Notes
Notes:
svn path=/head/; revision=363366
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index db35644389df..cdbd7ad31fa7 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4015,6 +4015,7 @@ install-ldconfig-file: > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} .endif .endif .endif @@ -4031,12 +4032,13 @@ install-ldconfig-file: .if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" .if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE} - @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_32DIR} + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} .endif .endif .if defined(INSTALLS_SHLIB) @@ -5618,6 +5620,10 @@ add-plist-buildinfo: .if !target(add-plist-info) .if defined(INFO) add-plist-info: + @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \ + [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \ + ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \ + fi # Process GNU INFO files at package install/deinstall time .for i in ${INFO} .if defined(NO_STAGE) |