>From bcb950a12c8a3fe77c65718fd20339198924488c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 24 Sep 2018 10:44:34 -0700 Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98make=20clean=E2=80=99=20with=20a?= =?UTF-8?q?=20file=20named=20=E2=80=98-.o=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem reported by T.V Raman in: https://lists.gnu.org/r/emacs-devel/2018-09/msg00866.html * Makefile.in (clean, extraclean): * doc/emacs/Makefile.in (mostlyclean): * doc/lispintro/Makefile.in (mostlyclean): * doc/lispref/Makefile.in (mostlyclean): * doc/misc/Makefile.in (mostlyclean, clean): * etc/refcards/Makefile (clean): * lib-src/Makefile.in (mostlyclean, extraclean): * lib/Makefile.in (clean): * lwlib/Makefile.in (clean mostlyclean): * oldXMenu/Makefile.in (clean mostlyclean): * src/Makefile.in (mostlyclean, extraclean): * test/Makefile.in (mostlyclean): Say ‘rm ./*.o’ instead of ‘rm *.o’ to avoid undesirable failure when a file name begins with ‘-’. --- Makefile.in | 4 ++-- doc/emacs/Makefile.in | 4 ++-- doc/lispintro/Makefile.in | 4 ++-- doc/lispref/Makefile.in | 4 ++-- doc/misc/Makefile.in | 8 ++++---- etc/refcards/Makefile | 2 +- lib-src/Makefile.in | 4 ++-- lib/Makefile.in | 2 +- lwlib/Makefile.in | 2 +- oldXMenu/Makefile.in | 2 +- src/Makefile.in | 6 +++--- test/Makefile.in | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5ea48824bd..c6b2cfa78a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -839,7 +839,7 @@ clean_dirs = clean: $(clean_dirs:=_clean) $(MAKE) -C admin/charsets $@ [ ! -d test ] || $(MAKE) -C test $@ - -rm -f *.tmp etc/*.tmp* + -rm -f ./*.tmp etc/*.tmp* -rm -rf info-dir.* ### 'bootclean' @@ -926,7 +926,7 @@ extraclean_dirs = extraclean: $(extraclean_dirs:=_extraclean) ${top_maintainer_clean} -rm -f config-tmp-* - -rm -f *~ \#* + -rm -f ./*~ \#* # The src subdir knows how to do the right thing # even when the build directory and source dir are different. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 1da2f1550f..54e173f8d6 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -206,8 +206,8 @@ .PHONY: ## Temp files. mostlyclean: - rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \ - *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs + rm -f ./*.aux ./*.log ./*.toc ./*.cp ./*.cps ./*.fn ./*.fns ./*.ky ./*.kys \ + ./*.op ./*.ops ./*.pg ./*.pgs ./*.tp ./*.tps ./*.vr ./*.vrs ## Products not in the release tarfiles. clean: mostlyclean diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 71739fdb35..e2a1229d5c 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -109,8 +109,8 @@ emacs-lisp-intro.ps: .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean mostlyclean: - rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \ - *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs + rm -f ./*.aux ./*.log ./*.toc ./*.cp ./*.cps ./*.fn ./*.fns ./*.ky ./*.kys \ + ./*.op ./*.ops ./*.pg ./*.pgs ./*.tp ./*.tps ./*.vr ./*.vrs clean: mostlyclean rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS) diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index 98ca90a96d..221f4f97f5 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -167,8 +167,8 @@ .PHONY: ## [12] stuff is from two-volume.make. mostlyclean: - rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \ - *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs + rm -f ./*.aux ./*.log ./*.toc ./*.cp ./*.cps ./*.fn ./*.fns ./*.ky ./*.kys \ + ./*.op ./*.ops ./*.pg ./*.pgs ./*.tp ./*.tps ./*.vr ./*.vrs rm -f elisp[12]* vol[12].tmp clean: mostlyclean diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 11086b3303..fd07ea4ca1 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -224,13 +224,13 @@ ${buildinfodir}/tramp.info tramp.html: .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean mostlyclean: - rm -f *.aux *.log *.toc *.c[mp] *.c[mp]s *.fn *.fns \ - *.ky *.kys *.op *.ops *.p[gj] *.p[gj]s *.sc *.scs *.ss \ - *.t[gp] *.t[gp]s *.vr *.vrs + rm -f ./*.aux ./*.log ./*.toc ./*.c[mp] ./*.c[mp]s ./*.fn ./*.fns \ + ./*.ky ./*.kys ./*.op ./*.ops ./*.p[gj] ./*.p[gj]s ./*.sc ./*.scs ./*.ss \ + ./*.t[gp] ./*.t[gp]s ./*.vr ./*.vrs rm -f gnustmp* clean: mostlyclean - rm -f *.dvi *.html *.pdf *.ps + rm -f ./*.dvi ./*.html ./*.pdf ./*.ps distclean: clean rm -f Makefile diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile index b61ff5f803..a3c8e55172 100644 --- a/etc/refcards/Makefile +++ b/etc/refcards/Makefile @@ -311,7 +311,7 @@ viperCard.dvi: .PHONY: clean clean: - -rm -f *.dvi *.log *.aux + -rm -f ./*.dvi ./*.log ./*.aux distclean: clean diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index b2b901788a..ecb9208a1c 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -334,7 +334,7 @@ uninstall: fi mostlyclean: - rm -f core *.o *.res + rm -f core ./*.o ./*.res clean: mostlyclean rm -f ${EXE_FILES} @@ -345,7 +345,7 @@ distclean: bootstrap-clean maintainer-clean: distclean extraclean: maintainer-clean - rm -f *~ \#* + rm -f ./*~ \#* ## Test the contents of the directory. check: diff --git a/lib/Makefile.in b/lib/Makefile.in index b26db27423..7dba31be71 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -118,7 +118,7 @@ TAGS: .PHONY: $(ETAGS) tags clean: - rm -f *.[ao] *-t \#* $(DEPDIR)/* + rm -f ./*.[ao] ./*-t \#* $(DEPDIR)/* mostlyclean: clean rm -f $(filter-out %-t,$(MOSTLYCLEANFILES)) distclean bootstrap-clean: mostlyclean diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index 6bd2608381..ed71270a77 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -111,7 +111,7 @@ $(globals_h): .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean clean mostlyclean: - rm -f *.o liblw.a \#* $(DEPDIR)/* + rm -f ./*.o liblw.a \#* $(DEPDIR)/* distclean: clean rm -f Makefile diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index d795038797..211bac97ee 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -138,7 +138,7 @@ libXMenu11.a: .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean clean mostlyclean: - rm -f libXMenu11.a *.o $(DEPDIR)/* + rm -f libXMenu11.a ./*.o $(DEPDIR)/* bootstrap-clean maintainer-clean distclean: clean rm -f Makefile diff --git a/src/Makefile.in b/src/Makefile.in index 7d9c2361a9..72f568988a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -645,12 +645,12 @@ .PHONY: .PHONY: versionclean extraclean mostlyclean: - rm -f temacs$(EXEEXT) core *.core \#* *.o + rm -f temacs$(EXEEXT) core ./*.core \#* ./*.o rm -f ../etc/DOC rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) rm -f buildobj.h rm -f globals.h gl-stamp - rm -f *.res *.tmp + rm -f ./*.res ./*.tmp clean: mostlyclean rm -f emacs-*.*.*[0-9]$(EXEEXT) emacs$(EXEEXT) $(DEPDIR)/* @@ -674,7 +674,7 @@ maintainer-clean: versionclean: -rm -f emacs$(EXEEXT) emacs-*.*.*[0-9]$(EXEEXT) ../etc/DOC* extraclean: distclean - -rm -f *~ \#* + -rm -f ./*~ \#* ETAGS = ../lib-src/etags${EXEEXT} diff --git a/test/Makefile.in b/test/Makefile.in index a1f4388288..adb316c3d9 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -307,7 +307,7 @@ .PHONY: mostlyclean: address@hidden f in ${LOGFILES}; do test ! -f $$f || mv $$f $$f~; done - rm -f *.tmp + rm -f ./*.tmp clean: find . '(' -name '*.log' -o -name '*.log~' ')' $(FIND_DELETE) -- 2.17.1