pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Relax rules a bit on INSTALLATION_DIRS -- we still ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbd6b7cfa8c1
branches:  trunk
changeset: 502458:bbd6b7cfa8c1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 04 20:36:42 2005 +0000

description:
Relax rules a bit on INSTALLATION_DIRS -- we still enforce that
directories listed in INSTALLATION_DIRS are created in ${PREFIX}, but
it's now okay to include ${PREFIX} at the front of each, directory,
e.g. this is now okay:

        INSTALLATION_DIRS+=     ${PREFIX}/bin

Makes using this variable a bit less unwieldy sometimes.

diffstat:

 mk/bsd.pkg.mk |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 6aa389c12ceb -r bbd6b7cfa8c1 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Nov 04 20:28:47 2005 +0000
+++ b/mk/bsd.pkg.mk     Fri Nov 04 20:36:42 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1741 2005/11/04 20:28:47 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1742 2005/11/04 20:36:42 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -2099,7 +2099,10 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        for dir in ${INSTALLATION_DIRS}; do                             \
                case $$dir in                                           \
-               /*)     ;;                                              \
+               ${PREFIX}/*)    ;;                                      \
+               *)              continue ;;                             \
+               done;                                                   \
+               case $$dir in                                           \
                *bin|*bin/*|*libexec|*libexec/*)                        \
                        ${INSTALL_PROGRAM_DIR} ${PREFIX}/$$dir ;;       \
                ${PKGMANDIR}/*)                                         \



Home | Main Index | Thread Index | Old Index