summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-03-09 03:28:58 +0000
committerrillig <rillig@pkgsrc.org>2007-03-09 03:28:58 +0000
commitc66cd8fa30205f99f5c849f0d3c81ccb8feb6dea (patch)
tree13c32c59b7b9a3761a34ee506219cb1b8b08749e /mk
parenta22ded76263f0f09a42654961b9fad5c32ea8a1d (diff)
downloadpkgsrc-c66cd8fa30205f99f5c849f0d3c81ccb8feb6dea.tar.gz
Fixed pkglint warnings.
Diffstat (limited to 'mk')
-rw-r--r--mk/install/bin-install.mk10
-rw-r--r--mk/install/install.mk18
-rw-r--r--mk/install/replace.mk19
3 files changed, 24 insertions, 23 deletions
diff --git a/mk/install/bin-install.mk b/mk/install/bin-install.mk
index 4bdff295a0d..f617359efbd 100644
--- a/mk/install/bin-install.mk
+++ b/mk/install/bin-install.mk
@@ -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 @@ BINPKG_SITES?=
.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-bin-install-lock: \
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 --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}
diff --git a/mk/install/replace.mk b/mk/install/replace.mk
index 4c39181ea36..a4f6c8db3a7 100644
--- a/mk/install/replace.mk
+++ b/mk/install/replace.mk
@@ -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_TARGETS+= unprivileged-install-hook
# 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