aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2012-06-06 14:23:17 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2012-06-06 14:23:17 +0000
commit2641586787c370679d342f04fb37fc2fb08bb50a (patch)
treeb1bb0df2e5cbcd6f7827400ebb270c2a88f04ad0 /Mk
parentdcec4eb3f1496616637fac7f2df5fb9a88a77e69 (diff)
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index acf685424ef2..a535cb5da4a2 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -6164,7 +6164,7 @@ showconfig-recursive:
.if !target(rmconfig)
rmconfig:
-.if defined(OPTIONS) && exists(${OPTIONSFILE})
+.if exists(${OPTIONSFILE})
-@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \
optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \
if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \
@@ -6174,7 +6174,7 @@ rmconfig:
${ECHO_MSG} "===> Returning to user credentials"; \
else \
${RM} -f ${OPTIONSFILE}; \
- ${RMDIR} $${optionsdir} || return 0; \
+ ${RMDIR} $${optionsdir} 2>/dev/null || return 0; \
fi
.else
@${ECHO_MSG} "===> No user-specified options configured for ${PKGNAME}"