diff options
| author | bapt <bapt@FreeBSD.org> | 2014-12-29 03:01:42 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-12-29 03:01:42 +0800 |
| commit | 4856d420cbda832fb1d8811a76057a857a393703 (patch) | |
| tree | 4b9380d009f4190c35dd8140fabbcad82ee41688 /Mk | |
| parent | da4fdd7813b4d28ba836aebb98b108d6115901ea (diff) | |
| download | freebsd-ports-gnome-4856d420cbda832fb1d8811a76057a857a393703.tar.gz freebsd-ports-gnome-4856d420cbda832fb1d8811a76057a857a393703.tar.zst freebsd-ports-gnome-4856d420cbda832fb1d8811a76057a857a393703.zip | |
Simplify a bit the rmconfig target
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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} ; \ |