kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add LOCALBASE-based ldconfig dir to plist for non-default PREFIX

Browse source 
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
This commit is contained in:
Dmitry Marakasov 2015-10-08 14:57:29 +00:00
parent 48829dd945
commit a46575cc6b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=398831
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Mk/bsd.port.mk
View file

@ -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)