pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/install mk/install: fix indentation and alignment, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a986edf7a758
branches: trunk
changeset: 381412:a986edf7a758
user: rillig <rillig%pkgsrc.org@localhost>
date: Wed Jul 06 18:53:58 2022 +0000
description:
mk/install: fix indentation and alignment, no functional change
diffstat:
mk/install/bin-install.mk | 8 ++++----
mk/install/bsd.install-vars.mk | 6 +++---
mk/install/install.mk | 15 ++++++++-------
3 files changed, 15 insertions(+), 14 deletions(-)
diffs (90 lines):
diff -r 1982e5feae34 -r a986edf7a758 mk/install/bin-install.mk
--- a/mk/install/bin-install.mk Wed Jul 06 18:50:12 2022 +0000
+++ b/mk/install/bin-install.mk Wed Jul 06 18:53:58 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bin-install.mk,v 1.29 2019/09/02 02:23:03 rillig Exp $
+# $NetBSD: bin-install.mk,v 1.30 2022/07/06 18:53:58 rillig Exp $
#
# This file provides the following targets:
@@ -55,11 +55,11 @@
do-bin-install \
do-bin-install-from-source
-. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
do-bin-install: su-do-bin-install
-. else
+.else
do-bin-install: su-target
-. endif
+.endif
@${PHASE_MSG} "Binary install for "${PKGNAME_REQD:Q}
su-do-bin-install: \
diff -r 1982e5feae34 -r a986edf7a758 mk/install/bsd.install-vars.mk
--- a/mk/install/bsd.install-vars.mk Wed Jul 06 18:50:12 2022 +0000
+++ b/mk/install/bsd.install-vars.mk Wed Jul 06 18:53:58 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install-vars.mk,v 1.10 2020/07/08 12:37:13 jperkin Exp $
+# $NetBSD: bsd.install-vars.mk,v 1.11 2022/07/06 18:53:58 rillig Exp $
#
# This Makefile fragment is included separately by bsd.pkg.mk and
# defines some variables which must be defined earlier than where
@@ -36,9 +36,9 @@
#
.if !defined(_MANCOMPRESSED)
. if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS])
-_MANCOMPRESSED= yes
+_MANCOMPRESSED= yes
. else
-_MANCOMPRESSED= no
+_MANCOMPRESSED= no
. endif
. if defined(MANCOMPRESSED_IF_MANZ) && defined(PKGMAKECONF)
_MANCOMPRESSED!= \
diff -r 1982e5feae34 -r a986edf7a758 mk/install/install.mk
--- a/mk/install/install.mk Wed Jul 06 18:50:12 2022 +0000
+++ b/mk/install/install.mk Wed Jul 06 18:53:58 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.80 2021/08/14 08:38:01 rillig Exp $
+# $NetBSD: install.mk,v 1.81 2022/07/06 18:53:58 rillig Exp $
#
# This file provides the code for the "install" phase.
#
@@ -201,11 +201,11 @@
_INSTALL_ALL_TARGETS+= error-check
.PHONY: install-all su-install-all
-. if !empty(_MAKE_INSTALL_AS_ROOT:M[Yy][Ee][Ss])
+.if !empty(_MAKE_INSTALL_AS_ROOT:M[Yy][Ee][Ss])
install-all: su-target
-. else
+.else
install-all: su-install-all
-. endif
+.endif
su-install-all: ${_INSTALL_ALL_TARGETS}
######################################################################
@@ -218,8 +218,8 @@
install-check-umask:
${RUN} \
umask=`${SH} -c umask`; \
- if [ "$$umask" -ne ${DEF_UMASK} ]; then \
- ${WARNING_MSG} "Your umask is \`\`$$umask''."; \
+ if [ "$$umask" -ne ${DEF_UMASK} ]; then \
+ ${WARNING_MSG} "Your umask is \`\`$$umask''."; \
${WARNING_MSG} "If this is not desired, set it to an appropriate value (${DEF_UMASK}) and install"; \
${WARNING_MSG} "this package again by \`\`${MAKE} deinstall reinstall''."; \
fi
@@ -235,7 +235,8 @@
# A shell command that creates the directory ${DESTDIR}${PREFIX}/$$dir
# with appropriate permissions and ownership.
#
-_INSTALL_ONE_DIR_CMD= { \
+_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 \
Home |
Main Index |
Thread Index |
Old Index