aboutsummaryrefslogtreecommitdiff
path: root/etc/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'etc/Makefile')
-rw-r--r--etc/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 10d2f7ea2c5c..88f890b91604 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -121,13 +121,11 @@ MTREES+= mtree/BSD.sendmail.dist /
MTREES+= ../${mtree} /
.endfor
-# Clean up some directories that where mistakenly created as files that
-# should not have been as part of the nvi update in r281994.
-# This should be removed after 11.0-RELEASE.
-DISTRIB_CLEANUP_SHARE_FILES= ${SHAREDIR}/doc/usd/10.exref ${SHAREDIR}/doc/usd/11.edit
-DISTRIB_CLEANUP_SHARE_FILES+= ${SHAREDIR}/doc/usd/12.vi ${SHAREDIR}/doc/usd/13.viref
+# Clean up files that have changed into directories, as mtree cannot handle this
+# scenario.
+DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__string
distrib-cleanup: .PHONY
- for file in ${DISTRIB_CLEANUP_SHARE_FILES}; do \
+ for file in ${DISTRIB_CLEANUP_FILES}; do \
if [ -f ${DESTDIR}/$${file} ]; then \
rm -f ${DESTDIR}/$${file}; \
fi; \