pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Added another diagnostic message to distinguish the...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/613385eb5e2f
branches:  trunk
changeset: 503670:613385eb5e2f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 24 20:02:40 2005 +0000

description:
Added another diagnostic message to distinguish the cases for non-text
file and non-existant file.

diffstat:

 mk/subst.mk |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r f4427e76bba2 -r 613385eb5e2f mk/subst.mk
--- a/mk/subst.mk       Thu Nov 24 19:46:45 2005 +0000
+++ b/mk/subst.mk       Thu Nov 24 20:02:40 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.24 2005/11/17 23:17:02 rillig Exp $
+# $NetBSD: subst.mk,v 1.25 2005/11/24 20:02:40 rillig Exp $
 #
 # This Makefile fragment implements a general text replacement facility.
 # Package makefiles define a ``class'', for each of which a particular
@@ -96,8 +96,10 @@
                                ${SUBST_POSTCMD.${_class_}};            \
                                ${ECHO} "$$file" >> ${.TARGET};         \
                        fi;                                             \
+               elif ${TEST} -f "$$file"; then                          \
+                       ${ECHO_SUBST_MSG} "[subst.mk] WARNING: Ignoring non-text file \"$$file\"." 1>&2; \
                else                                                    \
-                       ${ECHO_SUBST_MSG} "[subst.mk] WARNING: Ignoring non-text file \"$$file\"." 1>&2; \
+                       ${ECHO_SUBST_MSG} "[subst.mk] WARNING: Ignoring non-existant file \"$$file\"." 1>&2; \
                fi;                                                     \
        done
 .endfor



Home | Main Index | Thread Index | Old Index