Author: futatuki
Date: Mon Aug 8 14:09:30 2022
New Revision: 1903288
URL: http://svn.apache.org/viewvc?rev=1903288&view=rev
Log:
On the 1.14.x-r1903267 branch: Merge r1903267 from trunk, without the change
on r1883939
Modified:
subversion/branches/1.14.x-r1903267/ (props changed)
subversion/branches/1.14.x-r1903267/Makefile.in
Propchange: subversion/branches/1.14.x-r1903267/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1903267
Modified: subversion/branches/1.14.x-r1903267/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x-r1903267/Makefile.in?rev=1903288&r1=1903287&r2=1903288&view=diff
==============================================================================
--- subversion/branches/1.14.x-r1903267/Makefile.in (original)
+++ subversion/branches/1.14.x-r1903267/Makefile.in Mon Aug 8 14:09:30 2022
@@ -456,8 +456,9 @@ fast-clean: doc-clean
done
echo $(CLEAN_FILES) | xargs rm -f --
find $(CTYPES_PYTHON_SRC_DIR) $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
- $(abs_srcdir)/build
$(top_srcdir)/subversion/tests/cmdline/svntest \
- -name "*.pyc" -exec rm {} ';'
+ $(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline \
+ '(' -name "__pycache__" -prune -o -name "*.pyc" ')' \
+ -exec rm -rf {} ';'; \
# clean everything, returning to before './configure' was run.
SVN_CONFIG_SCRIPT_FILES = @SVN_CONFIG_SCRIPT_FILES@
@@ -957,7 +958,9 @@ clean-swig-py:
do \
cd $$d && rm -rf *.lo *.la *.o *.pyc .libs; \
done
- find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) -name "*.pyc" -exec rm {} ';'
+ find $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
+ '(' -name "__pycache__" -prune -o -name "*.pyc" ')' \
+ -exec rm -rf {} ';'
extraclean-swig-py: clean-swig-py
$(EXTRACLEAN_SWIG_PY)
