emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 78c0c8673b: Port ‘make clean’ to Solaris 10


From: Paul Eggert
Subject: master 78c0c8673b: Port ‘make clean’ to Solaris 10
Date: Sat, 25 Jun 2022 17:46:56 -0400 (EDT)

branch: master
commit 78c0c8673bba086842ef9ea57f44f446558e5ebf
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>

    Port ‘make clean’ to Solaris 10
    
    * test/Makefile.in (CLEAN_XML_FILES): New macro.
    (clean): Use it.
---
 test/Makefile.in | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/Makefile.in b/test/Makefile.in
index 67162c4883..0be5842512 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -341,9 +341,17 @@ mostlyclean:
        -@for f in ${LOGFILES}; do test ! -f $$f || mv $$f $$f~; done
        rm -f ./*.tmp
 
+# If 'find' supports -delete, it also supports -path.  Otherwise, use
+# -prune and $(FIND_DELETE) instead.  -prune is incompatible with -delete.
+ifeq ($(FIND_DELETE),-delete)
+CLEAN_XML_FILES = '(' -name '*.xml' -a ! -path '*resources*' ')' -delete
+else
+CLEAN_XML_FILES = -name '*resources*' -prune -o -name '*.xml' $(FIND_DELETE)
+endif
+
 clean:
        find . '(' -name '*.log' -o -name '*.log~' ')' $(FIND_DELETE)
-       find . '(' -name '*.xml' -a ! -path '*resources*' ')' $(FIND_DELETE)
+       find . $(CLEAN_XML_FILES)
        rm -f ${srcdir}/lisp/gnus/mml-sec-resources/random_seed
        rm -f $(test_module_dir)/*.o $(test_module_dir)/*.so \
          $(test_module_dir)/*.dll gmp.h



reply via email to

[Prev in Thread] Current Thread [Next in Thread]