[pkgsrc/trunk]: pkgsrc/mk/install Fixed pkglint warnings.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ef7e060a90a
branches:  trunk
changeset: 526406:7ef7e060a90a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Mar 09 03:28:58 2007 +0000

description:
Fixed pkglint warnings.

diffstat:

 mk/install/bin-install.mk |  10 ++++++----
 mk/install/install.mk     |  18 +++++++++---------
 mk/install/replace.mk     |  19 +++++++++----------
 3 files changed, 24 insertions(+), 23 deletions(-)

diffs (154 lines):

diff -r 0076f777826c -r 7ef7e060a90a mk/install/bin-install.mk
--- a/mk/install/bin-install.mk Fri Mar 09 03:15:33 2007 +0000
+++ b/mk/install/bin-install.mk Fri Mar 09 03:28:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bin-install.mk,v 1.8 2007/03/09 03:15:33 rillig Exp $
+# $NetBSD: bin-install.mk,v 1.9 2007/03/09 03:28:58 rillig Exp $
 #
 
 # This file provides the following targets:
@@ -30,7 +30,7 @@
 .PHONY: bin-install
 .PHONY: do-bin-install do-bin-install-from-source
 .PHONY: su-do-bin-install
-.PHONY: aquire-bin-install-lock locked-su-do-bin-install release-bin-install-lock
+.PHONY: acquire-bin-install-lock locked-su-do-bin-install release-bin-install-lock
 
 bin-install: \
        do-bin-install \
@@ -51,14 +51,16 @@
        release-localbase-lock
 
 locked-su-do-bin-install:
-       @found=`${PKG_BEST_EXISTS} \"${PKGWILDCARD}\" || ${TRUE}`;      \
+       ${RUN} \
+       found=`${PKG_BEST_EXISTS} "${PKGWILDCARD}" || ${TRUE}`; \
        if [ "$$found" != "" ]; then                                    \
                ${ERROR_MSG} "$$found is already installed - perhaps an older version?"; \
                ${ERROR_MSG} "If so, you may wish to \`\`pkg_delete $$found'' and install"; \
                ${ERROR_MSG} "this package again by \`\`${MAKE} bin-install'' to upgrade it properly."; \
                exit 1;                                                 \
        fi
-       @rel=${_SHORT_UNAME_R:Q};                                       \
+       ${RUN} \
+       rel=${_SHORT_UNAME_R:Q};                                        \
        arch=${MACHINE_ARCH:Q};                                         \
        pkgpath=${PKGREPOSITORY:Q};                                     \
        for i in ${BINPKG_SITES}; do                                    \
diff -r 0076f777826c -r 7ef7e060a90a mk/install/install.mk
--- a/mk/install/install.mk     Fri Mar 09 03:15:33 2007 +0000
+++ b/mk/install/install.mk     Fri Mar 09 03:28:58 2007 +0000
@@ -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-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 @@
 # 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 @@
                        dir=`${ECHO} "$$dir" | ${SED} "s|^${PREFIX}/||"` ;; \
                /*)     continue ;;                                     \
                esac;                                                   \
-               ${_INSTALL_ONE_DIR};                                    \
+               ${_INSTALL_ONE_DIR_CMD};                                \
        done
 .endif # INSTALLATION_DIRS
 
@@ -263,7 +263,7 @@
                -e 's,^info/,${PKGINFODIR}/,'                           \
                -e 's,^\([^$$@]*\)/[^/]*$$,\1,p'                        \
        | while read dir; do                                            \
-               ${_INSTALL_ONE_DIR};                                    \
+               ${_INSTALL_ONE_DIR_CMD};                                \
        done
 
 ######################################################################
@@ -338,7 +338,7 @@
 ### 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 @@
 ### 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}
diff -r 0076f777826c -r 7ef7e060a90a mk/install/replace.mk
--- a/mk/install/replace.mk     Fri Mar 09 03:15:33 2007 +0000
+++ b/mk/install/replace.mk     Fri Mar 09 03:28:58 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.9 2007/03/08 23:06:37 rillig Exp $
+# $NetBSD: replace.mk,v 1.10 2007/03/09 03:28:58 rillig Exp $
 #
 # Public targets:
 #
@@ -27,30 +27,29 @@
 # replace
 #
 
-.PHONY: replace su-replace
+.PHONY: replace
 .if defined(_PKGSRC_BARRIER)
 replace: ${_REPLACE_TARGETS} su-target
 .else
 replace: barrier
 .endif
 
-replace-message:
+replace-message: .PHONY
        @${PHASE_MSG} "Replacing for ${PKGNAME}"
-        @${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
+       @${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 
-su-replace: _flavor-replace
+su-replace: .PHONY _flavor-replace
 MAKEFLAGS.su-replace=  _UPDATE_RUNNING=yes
 
 #
 # undo-replace
 #
 
-.PHONY: undo-replace su-undo-replace
-undo-replace: undo-replace-message su-target
+undo-replace: .PHONY undo-replace-message su-target
 
-undo-replace-message:
+undo-replace-message: .PHONY
        @${PHASE_MSG} "Undoing replacement for ${PKGNAME}"
-        @${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
+       @${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 
-su-undo-replace: _flavor-undo-replace
+su-undo-replace: .PHONY _flavor-undo-replace
 MAKEFLAGS.su-undo-replace=     _UPDATE_RUNNING=yes