[PATCH v1 2/2] Makefile.sh clean up invocation of rmdir #2

From: Philip Prindeville <philipp@cpan.org>

From: Philip Prindeville <philipp@cpan.org>

Reduce noise from failed-but-ignored 'rmdir' invocations.

Signed-off-by: Philip Prindeville <philipp@cpan.org>
---
 Makefile.SH | 87 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/Makefile.SH b/Makefile.SH
index f1ab764ed491cf35bd1b151746f57645ee09aaeb..1ff3cbaf1334c92b264ff1ccdae84c32d3429dc5 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -276,6 +276,7 @@ LNS = $lns
 CPS = $cp
 RMS = rm -f
 RMS_R = rm -rf
+RMDIR = rmdir -f
 ranlib = $ranlib
 
 # The following are mentioned only to make metaconfig include the
@@ -1369,7 +1370,7 @@ veryclean:	_verycleaner _mopup _clobber
 # Do not 'make _mopup' directly.
 _mopup:
 	$(RMS) *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c opmini.c perlmini.c generate_uudmap$(EXE_EXT) $(generated_headers)
-	-rmdir .depending
+	$(RMDIR) .depending
 	-@test -f extra.pods && $(RMS) `cat extra.pods`
 	-@test -f vms/README_vms.pod && $(RMS) vms/README_vms.pod
 	$(RMS) perl.exp ext.libs $(generated_pods) uni.data opmini.o perlmini.o pod/roffitall
@@ -1421,50 +1422,50 @@ _cleaner2:
 	$(RMS) preload
 	$(RMS) pod2htmd.tmp
 	$(RMS_R) pod/perlfunc pod/perlipc
-	-rmdir ext/B/lib
+	$(RMDIR) ext/B/lib
 	$(RMS) dist/Time-HiRes/xdefine
 	$(RMS) so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR)
-	-rmdir lib/version lib/threads lib/inc/ExtUtils lib/inc lib/encoding
-	-rmdir lib/autodie/exception lib/autodie/Scope lib/autodie lib/XS
-	-rmdir lib/Win32API lib/VMS lib/Unicode/Collate/Locale
-	-rmdir lib/Unicode/Collate/CJK lib/Unicode/Collate lib/Tie/Hash
-	-rmdir lib/Thread lib/Text lib/Test2/Util lib/Test2/Tools
-	-rmdir lib/Test2/IPC/Driver lib/Test2/IPC lib/Test2/Hub/Interceptor
-	-rmdir lib/Test2/Hub lib/Test2/Formatter lib/Test2/EventFacet
-	-rmdir lib/Test2/Event/TAP lib/Test2/Event lib/Test2/API lib/Test2
-	-rmdir lib/Test/use lib/Test/Tester lib/Test/Builder/Tester
-	-rmdir lib/Test/Builder/IO lib/Test/Builder lib/Test lib/Term
-	-rmdir lib/TAP/Parser/YAMLish lib/TAP/Parser/SourceHandler
-	-rmdir lib/TAP/Parser/Scheduler lib/TAP/Parser/Result
-	-rmdir lib/TAP/Parser/Iterator lib/TAP/Parser lib/TAP/Harness
-	-rmdir lib/TAP/Formatter/File lib/TAP/Formatter/Console
-	-rmdir lib/TAP/Formatter lib/TAP lib/Sys/Syslog lib/Sys lib/Sub
-	-rmdir lib/Search lib/Scalar lib/Pod/Text lib/Pod/Simple
-	-rmdir lib/Pod/Perldoc lib/PerlIO/via lib/PerlIO lib/Perl
-	-rmdir lib/Parse/CPAN lib/Parse lib/Params lib/Net/FTP lib/Module/Load
-	-rmdir lib/Module/CoreList lib/Module lib/Memoize lib/Math/BigInt
-	-rmdir lib/Math/BigFloat lib/Math lib/MIME lib/Locale/Maketext
-	-rmdir lib/Locale/Codes lib/Locale lib/List/Util lib/List lib/JSON/PP
-	-rmdir lib/JSON lib/IPC lib/IO/Uncompress/Adapter lib/IO/Uncompress
-	-rmdir lib/IO/Socket lib/IO/Compress/Zlib lib/IO/Compress/Zip
-	-rmdir lib/IO/Compress/Gzip lib/IO/Compress/Base
-	-rmdir lib/IO/Compress/Adapter lib/IO/Compress lib/IO
-	-rmdir lib/I18N/LangTags lib/I18N lib/Hash/Util lib/Hash lib/HTTP
-	-rmdir lib/Filter/Util lib/Filter lib/File/Spec lib/ExtUtils/Typemaps
-	-rmdir lib/ExtUtils/ParseXS lib/ExtUtils/MakeMaker/version
-	-rmdir lib/ExtUtils/MakeMaker lib/ExtUtils/Liblist
-	-rmdir lib/ExtUtils/Constant lib/ExtUtils/Command
-	-rmdir lib/ExtUtils/CBuilder/Platform/Windows
-	-rmdir lib/ExtUtils/CBuilder/Platform lib/ExtUtils/CBuilder
-	-rmdir lib/Exporter lib/Encode/Unicode lib/Encode/MIME/Header
-	-rmdir lib/Encode/MIME lib/Encode/KR lib/Encode/JP lib/Encode/CN
-	-rmdir lib/Encode lib/Digest lib/Devel lib/Data lib/Config/Perl
-	-rmdir lib/Compress/Raw lib/Compress lib/Carp lib/CPAN/Plugin
-	-rmdir lib/CPAN/Meta/History lib/CPAN/Meta lib/CPAN/LWP
-	-rmdir lib/CPAN/Kwalify lib/CPAN/HTTP lib/CPAN/FTP lib/CPAN/Exception
-	-rmdir lib/CPAN/API lib/CPAN lib/Attribute lib/Archive/Tar lib/Archive
-	-rmdir lib/App/Prove/State/Result lib/App/Prove/State lib/App/Prove
-	-rmdir lib/App lib/Amiga
+	$(RMDIR) lib/version lib/threads lib/inc/ExtUtils lib/inc lib/encoding
+	$(RMDIR) lib/autodie/exception lib/autodie/Scope lib/autodie lib/XS
+	$(RMDIR) lib/Win32API lib/VMS lib/Unicode/Collate/Locale
+	$(RMDIR) lib/Unicode/Collate/CJK lib/Unicode/Collate lib/Tie/Hash
+	$(RMDIR) lib/Thread lib/Text lib/Test2/Util lib/Test2/Tools
+	$(RMDIR) lib/Test2/IPC/Driver lib/Test2/IPC lib/Test2/Hub/Interceptor
+	$(RMDIR) lib/Test2/Hub lib/Test2/Formatter lib/Test2/EventFacet
+	$(RMDIR) lib/Test2/Event/TAP lib/Test2/Event lib/Test2/API lib/Test2
+	$(RMDIR) lib/Test/use lib/Test/Tester lib/Test/Builder/Tester
+	$(RMDIR) lib/Test/Builder/IO lib/Test/Builder lib/Test lib/Term
+	$(RMDIR) lib/TAP/Parser/YAMLish lib/TAP/Parser/SourceHandler
+	$(RMDIR) lib/TAP/Parser/Scheduler lib/TAP/Parser/Result
+	$(RMDIR) lib/TAP/Parser/Iterator lib/TAP/Parser lib/TAP/Harness
+	$(RMDIR) lib/TAP/Formatter/File lib/TAP/Formatter/Console
+	$(RMDIR) lib/TAP/Formatter lib/TAP lib/Sys/Syslog lib/Sys lib/Sub
+	$(RMDIR) lib/Search lib/Scalar lib/Pod/Text lib/Pod/Simple
+	$(RMDIR) lib/Pod/Perldoc lib/PerlIO/via lib/PerlIO lib/Perl
+	$(RMDIR) lib/Parse/CPAN lib/Parse lib/Params lib/Net/FTP lib/Module/Load
+	$(RMDIR) lib/Module/CoreList lib/Module lib/Memoize lib/Math/BigInt
+	$(RMDIR) lib/Math/BigFloat lib/Math lib/MIME lib/Locale/Maketext
+	$(RMDIR) lib/Locale/Codes lib/Locale lib/List/Util lib/List lib/JSON/PP
+	$(RMDIR) lib/JSON lib/IPC lib/IO/Uncompress/Adapter lib/IO/Uncompress
+	$(RMDIR) lib/IO/Socket lib/IO/Compress/Zlib lib/IO/Compress/Zip
+	$(RMDIR) lib/IO/Compress/Gzip lib/IO/Compress/Base
+	$(RMDIR) lib/IO/Compress/Adapter lib/IO/Compress lib/IO
+	$(RMDIR) lib/I18N/LangTags lib/I18N lib/Hash/Util lib/Hash lib/HTTP
+	$(RMDIR) lib/Filter/Util lib/Filter lib/File/Spec lib/ExtUtils/Typemaps
+	$(RMDIR) lib/ExtUtils/ParseXS lib/ExtUtils/MakeMaker/version
+	$(RMDIR) lib/ExtUtils/MakeMaker lib/ExtUtils/Liblist
+	$(RMDIR) lib/ExtUtils/Constant lib/ExtUtils/Command
+	$(RMDIR) lib/ExtUtils/CBuilder/Platform/Windows
+	$(RMDIR) lib/ExtUtils/CBuilder/Platform lib/ExtUtils/CBuilder
+	$(RMDIR) lib/Exporter lib/Encode/Unicode lib/Encode/MIME/Header
+	$(RMDIR) lib/Encode/MIME lib/Encode/KR lib/Encode/JP lib/Encode/CN
+	$(RMDIR) lib/Encode lib/Digest lib/Devel lib/Data lib/Config/Perl
+	$(RMDIR) lib/Compress/Raw lib/Compress lib/Carp lib/CPAN/Plugin
+	$(RMDIR) lib/CPAN/Meta/History lib/CPAN/Meta lib/CPAN/LWP
+	$(RMDIR) lib/CPAN/Kwalify lib/CPAN/HTTP lib/CPAN/FTP lib/CPAN/Exception
+	$(RMDIR) lib/CPAN/API lib/CPAN lib/Attribute lib/Archive/Tar lib/Archive
+	$(RMDIR) lib/App/Prove/State/Result lib/App/Prove/State lib/App/Prove
+	$(RMDIR) lib/App lib/Amiga
 
 _realcleaner:
 	@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=distclean
-- 
2.7.4
0
philipp
7/1/2018 7:57:02 PM
perl.perl5.porters 47347 articles. 0 followers. Follow

0 Replies
41 Views

Similar Articles

[PageSpeed] 14

Reply: