diff options
| author | rillig <rillig@pkgsrc.org> | 2007-03-09 03:28:58 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-03-09 03:28:58 +0000 |
| commit | c66cd8fa30205f99f5c849f0d3c81ccb8feb6dea (patch) | |
| tree | 13c32c59b7b9a3761a34ee506219cb1b8b08749e /mk/install/install.mk | |
| parent | a22ded76263f0f09a42654961b9fad5c32ea8a1d (diff) | |
| download | pkgsrc-c66cd8fa30205f99f5c849f0d3c81ccb8feb6dea.tar.gz | |
Fixed pkglint warnings.
Diffstat (limited to 'mk/install/install.mk')
| -rw-r--r-- | mk/install/install.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mk/install/install.mk b/mk/install/install.mk index 2dfd51cd7d8..c172207a6ee 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.39 2007/03/09 03:05:38 rillig Exp $ +# $NetBSD: install.mk,v 1.40 2007/03/09 03:28:58 rillig Exp $ # # This file provides the code for the "install" phase. # @@ -83,13 +83,13 @@ install-message: ### install-check-interactive checks whether we must do an interactive ### install or not. ### -install-check-interactive: +install-check-interactive: .PHONY .if !empty(INTERACTIVE_STAGE:Minstall) && defined(BATCH) @${ERROR_MSG} "The installation stage of this package requires user interaction" @${ERROR_MSG} "Please install manually with:" @${ERROR_MSG} " \"cd ${.CURDIR} && ${MAKE} install\"" - @${TOUCH} ${_INTERACTIVE_COOKIE} - @${FALSE} + ${RUN} ${TOUCH} ${_INTERACTIVE_COOKIE} + ${RUN} ${FALSE} .else @${DO_NADA} .endif @@ -212,7 +212,7 @@ _MTREE_ARGS?= -U -f ${_MTREE_FILE} -d -e -p # A shell command that creates the directory ${DESTDIR}${PREFIX}/$$dir # with appropriate permissions and ownership. # -_INSTALL_ONE_DIR= { \ +_INSTALL_ONE_DIR_CMD= { \ ddir="${DESTDIR}${PREFIX}/$$dir"; \ [ ! -f "$$ddir" ] || ${FAIL_MSG} "[install.mk] $$ddir should be a directory, but is a file."; \ case "$$dir" in \ @@ -241,7 +241,7 @@ install-makedirs: dir=`${ECHO} "$$dir" | ${SED} "s|^${PREFIX}/||"` ;; \ /*) continue ;; \ esac; \ - ${_INSTALL_ONE_DIR}; \ + ${_INSTALL_ONE_DIR_CMD}; \ done .endif # INSTALLATION_DIRS @@ -263,7 +263,7 @@ install-dirs-from-PLIST: -e 's,^info/,${PKGINFODIR}/,' \ -e 's,^\([^$$@]*\)/[^/]*$$,\1,p' \ | while read dir; do \ - ${_INSTALL_ONE_DIR}; \ + ${_INSTALL_ONE_DIR_CMD}; \ done ###################################################################### @@ -338,7 +338,7 @@ privileged-install-hook: .PHONY ### install-clean removes the state files for the "install" and ### later phases so that the "install" target may be re-invoked. ### -install-clean: package-clean check-clean +install-clean: .PHONY package-clean check-clean ${RUN} ${RM} -f ${PLIST} ${_COOKIE.install} ###################################################################### @@ -347,5 +347,5 @@ install-clean: package-clean check-clean ### bootstrap-register registers "bootstrap" packages that are installed ### by the pkgsrc/bootstrap/bootstrap script. ### -bootstrap-register: _flavor-register clean +bootstrap-register: .PHONY _flavor-register clean @${DO_NADA} |