diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-09-24 09:31:44 +0800 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-09-24 09:31:44 +0800 |
| commit | d2ea5f25e287ab84bae65a204d8d7185f6b88b41 (patch) | |
| tree | 394a2de452af386723687f8e04762c092a76435b /Mk | |
| parent | 93e68e083c5bf4d31b7698ea6b4ebc5da8647316 (diff) | |
| download | freebsd-ports-gnome-d2ea5f25e287ab84bae65a204d8d7185f6b88b41.tar.gz freebsd-ports-gnome-d2ea5f25e287ab84bae65a204d8d7185f6b88b41.tar.zst freebsd-ports-gnome-d2ea5f25e287ab84bae65a204d8d7185f6b88b41.zip | |
- Be explicit about prefix with @cwd for USE_LDCONFIG
This fixes an issue with staging with pkg_install since it uses pkg_create
-S which doesn't seem to work properly with "@cwd" resetting to -p
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 850e765b0b68..bb20c4074ae2 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4054,7 +4054,7 @@ install-ldconfig-file: .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ > ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} - @${ECHO_CMD} "@cwd" >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} .if defined(NO_LDCONFIG_MTREE) @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" >> ${TMPPLIST} @@ -4079,7 +4079,7 @@ install-ldconfig-file: .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} - @${ECHO_CMD} "@cwd" >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} .if defined(NO_LDCONFIG_MTREE) @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST} |