diff options
| author | joerg <joerg@pkgsrc.org> | 2007-07-02 14:54:09 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-07-02 14:54:09 +0000 |
| commit | 409b183fc09db26d6baa76e7f68916ef46c4673e (patch) | |
| tree | 15cc825e1aa8d8d452f920e475ee512d1c044118 /mk/install | |
| parent | f1e659c224ef9d91d748e08becbfd3e46a2dc318 (diff) | |
| download | pkgsrc-409b183fc09db26d6baa76e7f68916ef46c4673e.tar.gz | |
Remove USE_MTREE support. Keep one copy (the NetBSD version) for
the purpose of print-PLIST in plist/common-dirs.mtree.
Discussed with wiz@, no objections on tech-pkg@.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/bsd.install-vars.mk | 6 | ||||
| -rw-r--r-- | mk/install/install.mk | 13 |
2 files changed, 4 insertions, 15 deletions
diff --git a/mk/install/bsd.install-vars.mk b/mk/install/bsd.install-vars.mk index aee1c14c130..4be1f413741 100644 --- a/mk/install/bsd.install-vars.mk +++ b/mk/install/bsd.install-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install-vars.mk,v 1.6 2007/04/19 16:52:03 joerg Exp $ +# $NetBSD: bsd.install-vars.mk,v 1.7 2007/07/02 14:54:10 joerg Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -12,10 +12,6 @@ # the "real" installation should start. # -.if defined(USE_MTREE) -USE_TOOLS+= mtree:bootstrap -.endif - # If MANZ is defined, then we want the final man pages to be compressed. # If MANZ is not defined, then we want the final man pages to be # uncompressed. diff --git a/mk/install/install.mk b/mk/install/install.mk index 1434151f8bc..58fa17ca92b 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.42 2007/04/19 18:16:36 xtraeme Exp $ +# $NetBSD: install.mk,v 1.43 2007/07/02 14:54:10 joerg Exp $ # # This file provides the code for the "install" phase. # @@ -203,12 +203,9 @@ install-check-umask: ### install-makedirs (PRIVATE) ###################################################################### ### install-makedirs is a target to create directories expected to -### exist prior to installation. If a package sets INSTALLATION_DIRS, -### then it's known to pre-create all of the directories that it needs -### at install-time, so we don't need mtree to do it for us. +### exist prior to installation. The package is supposed to create +### all directories not listed in INSTALLATION_DIRS. ### -_MTREE_FILE?= ${PKGSRCDIR}/mk/platform/${OPSYS}.pkg.dist -_MTREE_ARGS?= -U -f ${_MTREE_FILE} -d -e -p # A shell command that creates the directory ${DESTDIR}${PREFIX}/$$dir # with appropriate permissions and ownership. @@ -229,10 +226,6 @@ _INSTALL_ONE_DIR_CMD= { \ .PHONY: install-makedirs install-makedirs: ${RUN} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX} -.if defined(USE_MTREE) - ${RUN} [ ! -f ${_MTREE_FILE} ] || \ - ${MTREE} ${_MTREE_ARGS} ${DESTDIR}${PREFIX}/ -.endif .if defined(INSTALLATION_DIRS) && !empty(INSTALLATION_DIRS) @${STEP_MSG} "Creating installation directories" ${RUN} \ |