diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2015-10-08 22:57:29 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-10-08 22:57:29 +0800 |
| commit | 21f44327e690a77d7f97b9e2ef0ecd8daa2b959d (patch) | |
| tree | 0cfa99eadfb3f2b91ee71e65466e989e954c0bf8 /Mk | |
| parent | cd01b7a94a46cfdf02ca9f98e3e88777d1efc8b6 (diff) | |
| download | freebsd-ports-gnome-21f44327e690a77d7f97b9e2ef0ecd8daa2b959d.tar.gz freebsd-ports-gnome-21f44327e690a77d7f97b9e2ef0ecd8daa2b959d.tar.zst freebsd-ports-gnome-21f44327e690a77d7f97b9e2ef0ecd8daa2b959d.zip | |
Add LOCALBASE-based ldconfig dir to plist for non-default PREFIX
ldconfig file is always installed into LOCALBASE-based directory
(${LOCALBASE}/${LDCONFIG_DIR}) which is first created. When a port
redefines PREFIX (PREFIX != LOCALBASE), this directory needs to be
mentioned in pkg-plist.
Add the directory to the plist. While here, add identation to nested
make conditions and loops to improve readability and simplify one
empty .if body.
This fixes stage-qa for biology/emboss and cad/brlcad
Approved by: portmgr (bapt)
Differential Revision: D3815
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 8e41cce41721..12c49074030e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3626,33 +3626,38 @@ install-mtree: .if !target(install-ldconfig-file) install-ldconfig-file: -.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) -.if defined(USE_LDCONFIG) -.if defined(USE_LINUX_PREFIX) -.else -.if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER) +. if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) +. if defined(USE_LDCONFIG) +. if !defined(USE_LINUX_PREFIX) +. if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing ldconfig configuration file" -.if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE} +. if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE} @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR} -.endif +. endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} >> ${TMPPLIST} -.endif -.endif -.endif -.if defined(USE_LDCONFIG32) -.if !defined(INSTALL_AS_USER) +. if ${PREFIX} != ${LOCALBASE} + @${ECHO_CMD} "@dir ${LOCALBASE}/${LDCONFIG_DIR}" >> ${TMPPLIST} +. endif +. endif +. endif +. endif +. if defined(USE_LDCONFIG32) +. if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" -.if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE} +. if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE} @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR} -.endif +. endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} @${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} >> ${TMPPLIST} -.endif -.endif -.endif +. if ${PREFIX} != ${LOCALBASE} + @${ECHO_CMD} "@dir ${LOCALBASE}/${LDCONFIG32_DIR}" >> ${TMPPLIST} +. endif +. endif +. endif +. endif .endif .if !target(create-users-groups) |