diff options
| author | joerg <joerg@pkgsrc.org> | 2016-04-10 15:58:02 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-04-10 15:58:02 +0000 |
| commit | a497b4efbc4f2224de42dbe984d4ba19106f256d (patch) | |
| tree | ca139b801ca51ee063165400f44be14eed94369e /mk/pkginstall | |
| parent | b6b9f4a1e6d214b96f03df58daa363d33e5e9f93 (diff) | |
| download | pkgsrc-a497b4efbc4f2224de42dbe984d4ba19106f256d.tar.gz | |
Remove support for USE_DESTDIR=no.
Diffstat (limited to 'mk/pkginstall')
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index 9ca7d4df7cb..7bc12c87b43 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.65 2016/04/10 15:33:42 joerg Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.66 2016/04/10 15:58:03 joerg Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -373,9 +373,8 @@ su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER} # make certain files set-uid or to change the ownership or a # directory. # -# Note that when USE_DESTDIR is in effect, the special permissions -# are not directly recorded (as file attributes) in the binary -# package file. +# The special permissions may not directly recorded (as file +# attributes) in the binary package file. # # SETUID_ROOT_PERMS is a convenience definition to note an executable is # meant to be setuid-root, and should be used as follows: @@ -1059,8 +1058,6 @@ INSTALL_SCRIPTS_ENV= PKG_PREFIX=${PREFIX} INSTALL_SCRIPTS_ENV+= PKG_METADATA_DIR=${_PKG_DBDIR}/${PKGNAME} INSTALL_SCRIPTS_ENV+= PKG_REFCOUNT_DBDIR=${PKG_REFCOUNT_DBDIR} -.PHONY: pre-install-script post-install-script - DEINSTALL_FILE= ${PKG_DB_TMPDIR}/+DEINSTALL INSTALL_FILE= ${PKG_DB_TMPDIR}/+INSTALL _DEINSTALL_FILE= ${_PKGINSTALL_DIR}/DEINSTALL @@ -1122,24 +1119,6 @@ ${_INSTALL_FILE}: ${INSTALL_SRC} esac ${RUN}${CHMOD} +x ${.TARGET} -pre-install-script: - ${RUN} \ - if ${TEST} -x ${INSTALL_FILE}; then \ - ${STEP_MSG} "Running PRE-INSTALL script actions"; \ - cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \ - ${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \ - PRE-INSTALL; \ - fi - -post-install-script: - ${RUN} \ - if ${TEST} -x ${INSTALL_FILE}; then \ - ${STEP_MSG} "Running POST-INSTALL script actions"; \ - cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \ - ${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \ - POST-INSTALL; \ - fi - # rc.d scripts are automatically generated and installed into the rc.d # scripts example directory at the post-install step. The following # variables are relevant to this process: |