cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

following landry's suggestion, add module hooks for post-install

Browse Source 
I'm not too happy about stuff that will remove .la automatically though,
seems to me this shouldn't be generated in the first place.

ETOOMUCHMAGIC ?
This commit is contained in:
espie 2012-12-31 09:14:07 +00:00
parent 076347b97a
commit 092496c30a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1200 2012/12/30 20:40:40 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1201 2012/12/31 09:14:07 espie Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -300,7 +300,7 @@ TARGETS += ${_s}-${_t}
. endif
. endfor
.endfor
.for _t in post-patch pre-configure configure pre-fake
.for _t in post-patch pre-configure configure pre-fake post-install
. for _m in ${MODULES:T:U}
. if defined(MOD${_m}_${_t})
TARGETS += MOD${_m}_${_t}
@ -2605,6 +2605,14 @@ ${_REGRESS_COOKIE}: ${_BUILD_COOKIE}
.endif
@${_MAKE_COOKIE} $@
# XXX we don't care about the order
.for _m in ${MODULES:T:U}
. if defined(MOD${_m}_post-install)
_hook-post-install::
@${MOD${_m}_post-install}
. endif
.endfor
${_FAKE_COOKIE}: ${_BUILD_COOKIE}
@${ECHO_MSG} "===> Faking installation for ${FULLPKGNAME}${_MASTER}"
@if [ x`${SUDO} /bin/sh -c umask` != x022 ]; then \
@ -2619,7 +2627,6 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
@${MOD${_m}_pre-fake}
. endif
.endfor
.if target(pre-fake)
@${_SUDOMAKESYS} pre-fake ${_FAKE_SETUP}
.endif
@ -2639,6 +2646,9 @@ ${_FAKE_COOKIE}: ${_BUILD_COOKIE}
.if target(post-install)
@${_SUDOMAKESYS} post-install ${_FAKE_SETUP}
.endif
.if target(_hook-post-install)
@${_SUDOMAKESYS} _hook-post-install ${_FAKE_SETUP}
.endif
.if ${MULTI_PACKAGES} == "-"
@if test -e ${PKGDIR}/README; then \
r=${WRKINST}${_README_DIR}/${FULLPKGNAME}; \
@ -3317,7 +3327,7 @@ dump-vars:
_all_phony = ${_recursive_depends_targets} \
${_recursive_targets} ${_dangerous_recursive_targets} \
_build-dir-depends \
_build-dir-depends _hook-post-install \
_internal-all _internal-build _internal-build-depends \
_internal-buildlib-depends _internal-buildwantlib-depends \
_internal-checksum _internal-clean _internal-configure _internal-depends \