pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/check Fix check-wrkref path.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5af918f24541
branches:  trunk
changeset: 552951:5af918f24541
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Mon Jan 12 13:11:22 2009 +0000

description:
Fix check-wrkref path.

_CHECK_WRKREF_FILELIST_CMD is a command which prints PLIST paths
converted to absolute path.  _CHECK_WRKREF_FILELIST_CMD can run
anywhere, so cd ${DESTDIR} before that is pointless.  To access files,
_CHECK_WRKREF_FILELIST_CMD's output needs to be s/^/${DESTDIR}/ when
destdir is used.


Reviewed By:    joerg

diffstat:

 mk/check/check-wrkref.mk |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r d441dc43711c -r 5af918f24541 mk/check/check-wrkref.mk
--- a/mk/check/check-wrkref.mk  Mon Jan 12 13:06:24 2009 +0000
+++ b/mk/check/check-wrkref.mk  Mon Jan 12 13:11:22 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-wrkref.mk,v 1.18 2008/02/20 10:23:26 rillig Exp $
+# $NetBSD: check-wrkref.mk,v 1.19 2009/01/12 13:11:22 uebayasi Exp $
 #
 # This file checks that the installed files don't contain any strings
 # that point to the directory where the package had been built, to make
@@ -73,7 +73,6 @@
        ${RUN} rm -f ${ERROR_DIR}/${.TARGET}
        ${RUN}                                  \
        exec 1>${ERROR_DIR}/${.TARGET};                                 \
-       cd ${DESTDIR}${PREFIX};                                         \
        ${_CHECK_WRKREF_FILELIST_CMD} | ${SORT} |                       \
        while read file; do                                             \
                case "$$file" in                                        \
@@ -82,7 +81,7 @@
                esac;                                                   \
                ${SHCOMMENT} "[$$file]";                                \
                for d in ${_CHECK_WRKREF_DIRS}; do                      \
-                       grep "$$d" "$$file" 2>/dev/null |               \
+                       grep "$$d" "${DESTDIR}$$file" 2>/dev/null |     \
                        sed -e "s|^|$$file:     |";                     \
                done;                                                   \
        done



Home | Main Index | Thread Index | Old Index