Date: Tue, 24 Sep 2013 01:31:45 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328081 - head/Mk Message-ID: <201309240131.r8O1Vjow012938@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Sep 24 01:31:44 2013 New Revision: 328081 URL: http://svnweb.freebsd.org/changeset/ports/328081 Log: - 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 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Sep 24 01:13:35 2013 (r328080) +++ head/Mk/bsd.port.mk Tue Sep 24 01:31:44 2013 (r328081) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309240131.r8O1Vjow012938>