From 6d27719aaf23ebd8efdaa069d7ddabe26176175b Mon Sep 17 00:00:00 2001 From: rillig Date: Wed, 23 Jan 2008 14:12:32 +0000 Subject: Replaced _PKG_SILENT and _PKG_DEBUG with RUN, after making sure that the additional error checking won't break anything that isn't intended to break. --- mk/pkginstall/bsd.pkginstall.mk | 161 ++++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 82 deletions(-) diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index 5bb981fbf21..e7162a8b5fb 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.38 2007/12/13 11:10:42 rillig Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.39 2008/01/23 14:12:32 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -255,15 +255,15 @@ _PKG_USERS+= ${_entry_}:${PKG_UID.${_entry_:C/\:.*//}}:${PKG_GECOS.${_entry_:C/\ .endfor ${_INSTALL_USERGROUP_DATAFILE}: - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ set -- dummy ${_PKG_GROUPS:C/\:*$//}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ i="$$1"; shift; \ ${ECHO} "# GROUP: $$i"; \ done - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ set -- dummy ${_PKG_USERS:C/\:*$//}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -275,11 +275,11 @@ ${_INSTALL_USERGROUP_FILE}: ${_INSTALL_USERGROUP_DATAFILE} ${_INSTALL_USERGROUP_FILE}: \ ../../mk/pkginstall/usergroup \ ${INSTALL_USERGROUPFUNCS_FILE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ ${SED} -e "/^# platform-specific adduser\/addgroup functions/r${_INSTALL_USERGROUPFUNCS_FILE}" ../../mk/pkginstall/usergroup | \ ${SED} ${FILES_SUBST_SED} > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${_ZERO_FILESIZE_P} ${_INSTALL_USERGROUP_DATAFILE}; then \ ${RM} -f ${.TARGET}; \ ${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \ @@ -290,8 +290,8 @@ _INSTALL_USERGROUP_UNPACKER= ${_PKGINSTALL_DIR}/usergroup-unpack ${_INSTALL_USERGROUP_UNPACKER}: \ ${_INSTALL_USERGROUP_FILE} \ ${_INSTALL_USERGROUP_DATAFILE} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ exec 1>${.TARGET}; \ ${ECHO} "#!${SH}"; \ ${ECHO} ""; \ @@ -304,7 +304,7 @@ ${_INSTALL_USERGROUP_UNPACKER}: \ ${ECHO} ""; \ ${CAT} ${_INSTALL_USERGROUP_FILE} \ ${_INSTALL_USERGROUP_DATAFILE} - ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} + ${RUN}${CHMOD} +x ${.TARGET} .if defined(USERGROUP_PHASE) . if !empty(USERGROUP_PHASE:M*configure) @@ -330,7 +330,7 @@ PRE_CMD.su-create-usergroup= \ .PHONY: su-create-usergroup su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ cd ${_PKGINSTALL_DIR} && \ ${SH} ${_INSTALL_USERGROUP_UNPACKER}; \ exitcode=1; \ @@ -371,8 +371,8 @@ _INSTALL_UNPACK_TMPL+= ${_INSTALL_PERMS_FILE} _INSTALL_DATA_TMPL+= ${_INSTALL_PERMS_DATAFILE} ${_INSTALL_PERMS_DATAFILE}: - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${SPECIAL_PERMS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -384,10 +384,10 @@ ${_INSTALL_PERMS_DATAFILE}: ${_INSTALL_PERMS_FILE}: ${_INSTALL_PERMS_DATAFILE} ${_INSTALL_PERMS_FILE}: ../../mk/pkginstall/perms - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/perms > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${_ZERO_FILESIZE_P} ${_INSTALL_PERMS_DATAFILE}; then \ ${RM} -f ${.TARGET}; \ ${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \ @@ -486,8 +486,8 @@ _pkginstall-postinstall-check: .PHONY done ${_INSTALL_FILES_DATAFILE}: - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${RCD_SCRIPTS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -496,7 +496,7 @@ ${_INSTALL_FILES_DATAFILE}: egfile="${RCD_SCRIPTS_EXAMPLEDIR}/$$script"; \ ${ECHO} "# FILE: $$file cr $$egfile ${RCD_SCRIPTS_MODE}"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${CONF_FILES}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -506,7 +506,7 @@ ${_INSTALL_FILES_DATAFILE}: file=`strip_prefix "$$file"`; \ ${ECHO} "# FILE: $$file c $$egfile ${CONF_FILES_MODE}"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${REQD_FILES}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -516,7 +516,7 @@ ${_INSTALL_FILES_DATAFILE}: file=`strip_prefix "$$file"`; \ ${ECHO} "# FILE: $$file cf $$egfile ${REQD_FILES_MODE}"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${CONF_FILES_PERMS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -527,7 +527,7 @@ ${_INSTALL_FILES_DATAFILE}: file=`strip_prefix "$$file"`; \ ${ECHO} "# FILE: $$file c $$egfile $$mode $$owner $$group"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${REQD_FILES_PERMS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -541,10 +541,10 @@ ${_INSTALL_FILES_DATAFILE}: ${_INSTALL_FILES_FILE}: ${_INSTALL_FILES_DATAFILE} ${_INSTALL_FILES_FILE}: ../../mk/pkginstall/files - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/files > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${_ZERO_FILESIZE_P} ${_INSTALL_FILES_DATAFILE}; then \ ${RM} -f ${.TARGET}; \ ${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \ @@ -589,8 +589,8 @@ _INSTALL_UNPACK_TMPL+= ${_INSTALL_DIRS_FILE} _INSTALL_DATA_TMPL+= ${_INSTALL_DIRS_DATAFILE} ${_INSTALL_DIRS_DATAFILE}: - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN}${_FUNC_STRIP_PREFIX}; \ exec 1>>${.TARGET}; \ case ${PKG_SYSCONFSUBDIR:M*:Q}${CONF_FILES:M*:Q}${CONF_FILES_PERMS:M*:Q}"" in \ "") ;; \ @@ -608,13 +608,13 @@ ${_INSTALL_DIRS_DATAFILE}: esac; \ ;; \ esac - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ exec 1>>${.TARGET}; \ case ${RCD_SCRIPTS:M*:Q}"" in \ "") ;; \ *) ${ECHO} "# DIR: ${RCD_SCRIPTS_DIR:S/${PREFIX}\///} m" ;; \ esac - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${MAKE_DIRS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -622,7 +622,7 @@ ${_INSTALL_DIRS_DATAFILE}: dir=`strip_prefix "$$dir"`; \ ${ECHO} "# DIR: $$dir m"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${REQD_DIRS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -630,7 +630,7 @@ ${_INSTALL_DIRS_DATAFILE}: dir=`strip_prefix "$$dir"`; \ ${ECHO} "# DIR: $$dir fm"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${OWN_DIRS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -638,7 +638,7 @@ ${_INSTALL_DIRS_DATAFILE}: dir=`strip_prefix "$$dir"`; \ ${ECHO} "# DIR: $$dir mo"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${MAKE_DIRS_PERMS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -647,7 +647,7 @@ ${_INSTALL_DIRS_DATAFILE}: dir=`strip_prefix "$$dir"`; \ ${ECHO} "# DIR: $$dir m $$mode $$owner $$group"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${REQD_DIRS_PERMS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -656,7 +656,7 @@ ${_INSTALL_DIRS_DATAFILE}: dir=`strip_prefix "$$dir"`; \ ${ECHO} "# DIR: $$dir fm $$mode $$owner $$group"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${OWN_DIRS_PERMS}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -668,10 +668,10 @@ ${_INSTALL_DIRS_DATAFILE}: ${_INSTALL_DIRS_FILE}: ${_INSTALL_DIRS_DATAFILE} ${_INSTALL_DIRS_FILE}: ../../mk/pkginstall/dirs - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/dirs > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${_ZERO_FILESIZE_P} ${_INSTALL_DIRS_DATAFILE}; then \ ${RM} -f ${.TARGET}; \ ${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \ @@ -696,17 +696,17 @@ FILES_SUBST+= INSTALL_INFO=${INSTALL_INFO:Q} .endif ${_INSTALL_INFO_FILES_DATAFILE}: - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${.TARGET} + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN}${RM} -f ${.TARGET} + ${RUN}${TOUCH} ${TOUCH_ARGS} ${.TARGET} ${_INSTALL_INFO_FILES_FILE}: ${_INSTALL_INFO_FILES_DATAFILE} ${_INSTALL_INFO_FILES_FILE}: ../../mk/pkginstall/info-files - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/info-files > ${.TARGET} .if !defined(INFO_FILES) - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${_ZERO_FILESIZE_P} ${_INSTALL_INFO_FILES_DATAFILE}; then \ ${RM} -f ${.TARGET}; \ ${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \ @@ -717,7 +717,7 @@ ${_INSTALL_INFO_FILES_FILE}: ../../mk/pkginstall/info-files install-script-data: install-script-data-info-files install-script-data-info-files: .if defined(INFO_FILES) - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ if ${TEST} -x ${INSTALL_FILE}; then \ ${INFO_FILES_cmd} | \ while read file; do \ @@ -748,8 +748,8 @@ _INSTALL_UNPACK_TMPL+= ${_INSTALL_SHELL_FILE} _INSTALL_DATA_TMPL+= ${_INSTALL_SHELL_DATAFILE} ${_INSTALL_SHELL_DATAFILE}: - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${PKG_SHELL}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -760,10 +760,10 @@ ${_INSTALL_SHELL_DATAFILE}: ${_INSTALL_SHELL_FILE}: ${_INSTALL_SHELL_DATAFILE} ${_INSTALL_SHELL_FILE}: ../../mk/pkginstall/shell - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/shell > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${_ZERO_FILESIZE_P} ${_INSTALL_SHELL_DATAFILE}; then \ ${RM} -f ${.TARGET}; \ ${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \ @@ -805,8 +805,8 @@ _INSTALL_UNPACK_TMPL+= ${_INSTALL_SHLIBS_FILE} .endif ${_INSTALL_SHLIBS_FILE}: ../../mk/pkginstall/shlibs - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/shlibs > ${.TARGET} # FONTS_DIRS. are lists of directories in which the font databases @@ -864,8 +864,8 @@ DEPENDS+= encodings-[0-9]*:../../fonts/encodings FILES_SUBST+= X11_ENCODINGSDIR=${X11_ENCODINGSDIR:Q} ${_INSTALL_FONTS_DATAFILE}: - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${FONTS_DIRS.ttf}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -873,7 +873,7 @@ ${_INSTALL_FONTS_DATAFILE}: dir=`strip_prefix "$$dir"`; \ ${ECHO} "# FONTS: $$dir ttf"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${FONTS_DIRS.type1}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -881,7 +881,7 @@ ${_INSTALL_FONTS_DATAFILE}: dir=`strip_prefix "$$dir"`; \ ${ECHO} "# FONTS: $$dir type1"; \ done - ${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \ + ${RUN}${_FUNC_STRIP_PREFIX}; \ set -- dummy ${FONTS_DIRS.x11}; shift; \ exec 1>>${.TARGET}; \ while ${TEST} $$# -gt 0; do \ @@ -892,10 +892,10 @@ ${_INSTALL_FONTS_DATAFILE}: ${_INSTALL_FONTS_FILE}: ${_INSTALL_FONTS_DATAFILE} ${_INSTALL_FONTS_FILE}: ../../mk/pkginstall/fonts - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ ${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/fonts > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${_ZERO_FILESIZE_P} ${_INSTALL_FONTS_DATAFILE}; then \ ${RM} -f ${.TARGET}; \ ${TOUCH} ${TOUCH_ARGS} ${.TARGET}; \ @@ -1030,16 +1030,16 @@ generate-install-scripts: \ ${_DEINSTALL_FILE} ${_INSTALL_FILE} \ ${_DEINSTALL_FILE_DFLT} ${_INSTALL_FILE_DFLT} .if !exists(${DEINSTALL_FILE}) || !exists(${INSTALL_FILE}) - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${INSTALL_FILE:H} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${DEINSTALL_FILE:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${INSTALL_FILE:H} + ${RUN}${MKDIR} ${DEINSTALL_FILE:H} + ${RUN} \ if ${CMP} -s ${_INSTALL_FILE_DFLT:Q} ${_INSTALL_FILE:Q}; then \ ${TRUE}; \ else \ ${CP} -f ${_INSTALL_FILE} ${INSTALL_FILE}; \ ${CP} -f ${_DEINSTALL_FILE} ${DEINSTALL_FILE}; \ fi - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${CMP} -s ${_DEINSTALL_FILE_DFLT:Q} ${_DEINSTALL_FILE:Q}; then \ ${TRUE}; \ else \ @@ -1048,41 +1048,39 @@ generate-install-scripts: \ .endif ${_DEINSTALL_FILE_DFLT}: ${_DEINSTALL_TEMPLATES_DFLT} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} | \ - ${SED} ${FILES_SUBST_SED} > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN}${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} > ${.TARGET} + ${RUN}${CHMOD} +x ${.TARGET} ${_INSTALL_FILE_DFLT}: ${_INSTALL_TEMPLATES_DFLT} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} | \ - ${SED} ${FILES_SUBST_SED} > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN}${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} > ${.TARGET} + ${RUN}${CHMOD} +x ${.TARGET} ${_DEINSTALL_FILE}: ${DEINSTALL_SRC} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ exec 1>>${.TARGET}; \ case ${.ALLSRC:Q}"" in \ "") ${ECHO} "#!${SH}" ; \ ${ECHO} "exit 0" ;; \ *) ${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} ;; \ esac - ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} + ${RUN}${CHMOD} +x ${.TARGET} ${_INSTALL_FILE}: ${INSTALL_SRC} - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN}${MKDIR} ${.TARGET:H} + ${RUN} \ exec 1>>${.TARGET}; \ case ${.ALLSRC:Q}"" in \ "") ${ECHO} "#!${SH}" ; \ ${ECHO} "exit 0" ;; \ *) ${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} ;; \ esac - ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} + ${RUN}${CHMOD} +x ${.TARGET} pre-install-script: - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${TEST} -x ${INSTALL_FILE}; then \ ${STEP_MSG} "Running PRE-INSTALL script actions"; \ cd ${PKG_DB_TMPDIR} && ${SETENV} ${INSTALL_SCRIPTS_ENV} \ @@ -1091,7 +1089,7 @@ pre-install-script: fi post-install-script: - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if ${TEST} -x ${INSTALL_FILE}; then \ ${STEP_MSG} "Running POST-INSTALL script actions"; \ cd ${PKG_DB_TMPDIR} && ${SETENV} ${INSTALL_SCRIPTS_ENV} \ @@ -1128,13 +1126,12 @@ RCD_SCRIPT_WRK.${_script_}?= ${WRKDIR}/${_script_} generate-rcd-scripts: ${RCD_SCRIPT_WRK.${_script_}} ${RCD_SCRIPT_WRK.${_script_}}: ${RCD_SCRIPT_SRC.${_script_}} @${STEP_MSG} "Creating ${.TARGET}" - ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} | \ - ${SED} ${FILES_SUBST_SED} > ${.TARGET} - ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} + ${RUN}${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} > ${.TARGET} + ${RUN}${CHMOD} +x ${.TARGET} install-rcd-scripts: install-rcd-${_script_} install-rcd-${_script_}: ${RCD_SCRIPT_WRK.${_script_}} - ${_PKG_SILENT}${_PKG_DEBUG} \ + ${RUN} \ if [ -f ${RCD_SCRIPT_WRK.${_script_}} ]; then \ ${MKDIR} ${DESTDIR}${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}; \ ${INSTALL_SCRIPT} ${RCD_SCRIPT_WRK.${_script_}} \ -- cgit v1.2.3