CVS commit: pkgsrc/mk/install

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Aug 14 08:38:01 UTC 2021

Modified Files:
        pkgsrc/mk/install: install.mk

Log Message:
mk/install: fix documentation and speed up install-dirs-from-PLIST

The documentation did not mention that conditional entries in PLIST
files are skipped.  Pkglint doesn't know this either and issues wrong
notes that some directories are redundant in INSTALLATION_DIRS when in
reality they need to be listed there.

While here, filter out some duplicate directories.  This invokes the
command for creating a single directory less often.  Since PLIST files
are usually sorted, files in the same directory tend to be listed near
each other.

The fallback to the plain 'uniq' is needed for SCO_SV, which does not
define TOOLS_PLATFORM.uniq.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/mk/install/install.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/install/install.mk
diff -u pkgsrc/mk/install/install.mk:1.79 pkgsrc/mk/install/install.mk:1.80
--- pkgsrc/mk/install/install.mk:1.79   Wed Jul  8 12:37:13 2020
+++ pkgsrc/mk/install/install.mk        Sat Aug 14 08:38:01 2021
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.79 2020/07/08 12:37:13 jperkin Exp $
+# $NetBSD: install.mk,v 1.80 2021/08/14 08:38:01 rillig Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -278,12 +278,11 @@ install-makedirs:
        done
 .endif # INSTALLATION_DIRS
 
-# Creates the directories for all files that are mentioned in the static
-# PLIST files of the package, to make the declaration of
+# Creates the directories for all files that are listed unconditionally
+# in the static PLIST files of the package, to make the declaration of
 # INSTALLATION_DIRS redundant in some cases.
 #
-# To enable this, the variable INSTALLATION_DIRS_FROM_PLIST must be set
-# to "yes".
+# To enable this, set AUTO_MKDIRS to "yes".
 #
 .PHONY: install-dirs-from-PLIST
 install-dirs-from-PLIST:
@@ -298,6 +297,7 @@ install-dirs-from-PLIST:
                -e 's,^info/,${PKGINFODIR}/,'                           \
                -e 's,^share/locale/,${PKGLOCALEDIR}/locale/,'          \
                -e 's,^\([^$$@]*\)/[^/]*$$,\1,p'                        \
+       | ${TOOLS_PLATFORM.uniq:Uuniq}                                  \
        | while read dir; do                                            \
                ${_INSTALL_ONE_DIR_CMD};                                \
        done