pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Made the "check-files" target work even when PREFIX...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b51792a6a00
branches:  trunk
changeset: 512480:5b51792a6a00
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed May 10 16:09:08 2006 +0000

description:
Made the "check-files" target work even when PREFIX is a symlink by
searching in "${PREFIX}/." instead of ${PREFIX} alone. To get the same
output as before, each "/./" is replaced with "/" in the output.

diffstat:

 mk/bsd.pkg.check.mk |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 5a6214a1e8d8 -r 5b51792a6a00 mk/bsd.pkg.check.mk
--- a/mk/bsd.pkg.check.mk       Wed May 10 15:42:03 2006 +0000
+++ b/mk/bsd.pkg.check.mk       Wed May 10 16:09:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.check.mk,v 1.31 2006/05/08 21:29:07 joerg Exp $
+# $NetBSD: bsd.pkg.check.mk,v 1.32 2006/05/10 16:09:08 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the various install-time "check"
@@ -189,19 +189,22 @@
 
 ${_CHECK_FILES_PRE.prefix} ${_CHECK_FILES_POST.prefix}:
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${FIND} ${PREFIX} \( -type f -or -type l \) -print 2>/dev/null  \
+       ${FIND} ${PREFIX}/. \( -type f -or -type l \) -print 2>/dev/null \
+               | ${SED} -e 's,/\./,/,'                                 \
                | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET}              \
                 || ${TRUE}
 
 ${_CHECK_FILES_PRE.sysconfdir} ${_CHECK_FILES_POST.sysconfdir}:
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${FIND} ${PKG_SYSCONFDIR} -print 2>/dev/null                    \
+       ${FIND} ${PKG_SYSCONFDIR}/. -print 2>/dev/null                  \
+               | ${SED} -e 's,/\./,/,'                                 \
                | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET}              \
                || ${TRUE}
 
 ${_CHECK_FILES_PRE.varbase} ${_CHECK_FILES_POST.varbase}:
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${FIND} ${VARBASE} -print 2>/dev/null                           \
+       ${FIND} ${VARBASE}/. -print 2>/dev/null                         \
+               | ${SED} -e 's,/\./,/,'                                 \
                | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET}              \
                || ${TRUE}
 



Home | Main Index | Thread Index | Old Index