pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Use ${DO_NADA} to introduce a do-nothing line (as i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/77512d1dbaa7
branches:  trunk
changeset: 470745:77512d1dbaa7
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Mar 11 19:37:20 2004 +0000

description:
Use ${DO_NADA} to introduce a do-nothing line (as is done elsewhere in
pkgsrc); simply # makes older bmake hork up in combination with some shells.

diffstat:

 mk/bsd.pkg.mk |  23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diffs (37 lines):

diff -r c2a83a5861b1 -r 77512d1dbaa7 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Mar 11 19:07:03 2004 +0000
+++ b/mk/bsd.pkg.mk     Thu Mar 11 19:37:20 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1417 2004/03/09 19:22:24 reed Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1418 2004/03/11 19:37:20 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -2696,16 +2696,17 @@
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} do-install
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install
-       ${_PKG_SILENT}#
-       ${_PKG_SILENT}# PLIST must be generated at this late point (instead of
-       ${_PKG_SILENT}# depending on it somewhere earlier), because it needs
-       ${_PKG_SILENT}# to be created _after_ the {pre,do,post}-install
-       ${_PKG_SILENT}# targets are run.
-       ${_PKG_SILENT}#
-       ${_PKG_SILENT}# We generate _before_ post-install-script is run so
-       ${_PKG_SILENT}# that the real config files and rc.d scripts aren't
-       ${_PKG_SILENT}# listed in the PLIST.
-       ${_PKG_SILENT}#
+       ${_PKG_SILENT}${DO_NADA} \
+               #                                                               \
+               # PLIST must be generated at this late point (instead of        \
+               # depending on it somewhere earlier), because it needs          \
+               # to be created _after_ the {pre,do,post}-install               \
+               # targets are run.                                              \
+               #                                                               \
+               # We generate _before_ post-install-script is run so            \
+               # that the real config files and rc.d scripts aren't            \
+               # listed in the PLIST.                                          \
+               #
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} ${PLIST}
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install-script
        ${_PKG_SILENT}${_PKG_DEBUG}newmanpages=`${EGREP} -h             \



Home | Main Index | Thread Index | Old Index