summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorkristerw <kristerw>2005-08-14 17:26:13 +0000
committerkristerw <kristerw>2005-08-14 17:26:13 +0000
commit494948876511582f56f3b31d2decf3ee080febe2 (patch)
tree5f620d6f2d25f8fec1a1ddf699b8d306929d1d35 /mk
parentfb3fdb73cdbb4ebddd0a8b4790fc2c6b18ac9977 (diff)
downloadpkgsrc-494948876511582f56f3b31d2decf3ee080febe2.tar.gz
The check-files-post need to be done before post-install-script,
to prevent errors from pacakes using e.g. CONF_FILES.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 4835297db6e..34d49fa765c 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1712 2005/08/10 18:21:07 kristerw Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1713 2005/08/14 17:26:13 kristerw Exp $
#
# This file is in the public domain.
#
@@ -2118,7 +2118,6 @@ real-su-install: ${MESSAGE}
# listed in the PLIST. \
#
${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} ${PLIST}
- ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install-script
${_PKG_SILENT}${_PKG_DEBUG}newmanpages=`${EGREP} -h \
'^([^@/]*/)*man/([^/]*/)?(man[1-9ln]/.*\.[1-9ln]|cat[1-9ln]/.*\.0)(\.gz)?$$' \
${PLIST} 2>/dev/null || ${TRUE}`; \
@@ -2163,6 +2162,7 @@ real-su-install: ${MESSAGE}
.if empty(CHECK_FILES:M[nN][oO])
${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} check-files-post
.endif
+ ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install-script
.if ${_DO_SHLIB_CHECKS} == "yes"
. if ${PKG_INSTALLATION_TYPE} == "overwrite"
${_PKG_SILENT}${_PKG_DEBUG} \