pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Move message/${MESSAGE} target around, out of plist...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec6675f70140
branches:  trunk
changeset: 465199:ec6675f70140
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Dec 23 18:27:24 2003 +0000

description:
Move message/${MESSAGE} target around, out of plist target and its
supporting code.
While here comment the message target a bit.

diffstat:

 mk/bsd.pkg.mk |  35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diffs (56 lines):

diff -r a67019f793ce -r ec6675f70140 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Dec 23 18:12:34 2003 +0000
+++ b/mk/bsd.pkg.mk     Tue Dec 23 18:27:24 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1325 2003/12/23 11:14:20 tron Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1326 2003/12/23 18:27:24 seb Exp $
 #
 # This file is in the public domain.
 #
@@ -4911,21 +4911,6 @@
 .  endif
 .endif
 
-.PHONY: message
-message: ${MESSAGE}
-.ifdef MESSAGE
-${MESSAGE}: ${MESSAGE_SRC}
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       if [ -z "${MESSAGE_SRC}" ]; then                                \
-               ${ECHO} "${MESSAGE_SRC} not found.";                    \
-               ${ECHO} "Please set MESSAGE_SRC correctly.";            \
-       else                                                            \
-               ${CAT} ${MESSAGE_SRC} |                                 \
-                       ${SED} ${MESSAGE_SUBST_SED}                     \
-                       > ${MESSAGE};                                   \
-       fi
-.endif
-
 # GENERATE_PLIST is a sequence of commands, terminating in a semicolon,
 #      that outputs contents for a PLIST to stdout and is appended to
 #      the contents of ${_PLIST_SRC}.
@@ -4964,6 +4949,24 @@
          ${MAKE} ${MAKEFLAGS} do-shlib-handling                        \
                SHLIB_PLIST_MODE=1
 
+# generate ${MESSAGE} from ${MESSAGE_SRC} by substituting
+# for MESSAGE_SUBST entries 
+
+.PHONY: message
+message: ${MESSAGE}
+.ifdef MESSAGE
+${MESSAGE}: ${MESSAGE_SRC}
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       if [ -z "${MESSAGE_SRC}" ]; then                                \
+               ${ECHO} "${MESSAGE_SRC} not found.";                    \
+               ${ECHO} "Please set MESSAGE_SRC correctly.";            \
+       else                                                            \
+               ${CAT} ${MESSAGE_SRC} |                                 \
+                       ${SED} ${MESSAGE_SUBST_SED}                     \
+                       > ${MESSAGE};                                   \
+       fi
+.endif
+
 # generate ${DESCR} from ${DESCR_SRC} by:
 # - Appending the homepage URL, if any
 



Home | Main Index | Thread Index | Old Index