From e034d8f233fc875c681a4bba5a533ea9a38f32e1 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sun, 28 Dec 2014 19:01:42 +0000 Subject: Simplify a bit the rmconfig target --- Mk/bsd.port.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Mk/bsd.port.mk') diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 812b4efb19da..c03770298893 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -5578,7 +5578,7 @@ showconfig-recursive: rmconfig: .if exists(${OPTIONSFILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ - optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ + optionsdir=${OPTIONSFILE:H}; \ if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONSFILE}" ]; then \ ${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONSFILE} and $${optionsdir}"; \ ${SU_CMD} "${RM} -f ${OPTIONSFILE} ; \ @@ -5591,7 +5591,7 @@ rmconfig: .endif .if exists(${OPTIONS_FILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ - optionsdir=${OPTIONS_FILE}; optionsdir=$${optionsdir%/*}; \ + optionsdir=${OPTIONS_FILE:H}; \ if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONS_FILE}" ]; then \ ${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONS_FILE} and $${optionsdir}"; \ ${SU_CMD} "${RM} -f ${OPTIONS_FILE} ; \ -- cgit v1.2.3