[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 07/09: * */Makefile.*: Put straight error-prevention prefixes fo
|
From: |
Werner LEMBERG |
|
Subject: |
[groff] 07/09: * */Makefile.*: Put straight error-prevention prefixes for `rm'. |
|
Date: |
Sun, 30 Mar 2014 20:13:36 +0000 |
wl pushed a commit to branch master
in repository groff.
commit 7799ed5bf64d7a0c613679ccef48f7b686fa87ff
Author: Steffen Nurpmeso <address@hidden>
Date: Sun Mar 30 21:54:14 2014 +0200
* */Makefile.*: Put straight error-prevention prefixes for `rm'.
---
ChangeLog | 4 ++++
Makefile.comm | 18 +++++++++---------
Makefile.in | 4 ++--
contrib/eqn2graph/Makefile.sub | 6 +++---
contrib/gdiffmk/ChangeLog | 12 ++++++++----
contrib/gdiffmk/Makefile.sub | 4 ++--
contrib/glilypond/ChangeLog | 4 ++++
contrib/glilypond/Makefile.sub | 6 +++---
contrib/grap2graph/Makefile.sub | 6 +++---
contrib/groffer/ChangeLog | 6 +++++-
contrib/groffer/Makefile.sub | 8 ++++----
contrib/mm/ChangeLog | 7 ++++++-
contrib/mm/Makefile.sim | 4 ++--
contrib/mm/Makefile.sub | 37 ++++++++++++++++++-------------------
contrib/pdfmark/ChangeLog | 4 ++++
contrib/pdfmark/Makefile.sub | 12 +++---------
contrib/pic2graph/Makefile.sub | 6 +++---
doc/Makefile.in | 14 +++++++-------
font/devcp1047/Makefile.sub | 2 +-
font/devdvi/generate/Makefile | 4 ++--
font/devhtml/Makefile.sub | 4 ++--
font/devlatin1/Makefile.sub | 2 +-
font/devlj4/generate/Makefile | 4 ++--
font/devpdf/Makefile.sub | 6 +++---
font/devps/Makefile.sub | 2 +-
font/devps/generate/Makefile | 15 +++++++--------
font/devutf8/Makefile.sub | 2 +-
src/devices/gropdf/Makefile.sub | 6 ++----
src/devices/xditview/Makefile.sub | 4 ++--
src/libs/libgroff/Makefile.sub | 2 +-
src/preproc/eqn/Makefile.sub | 6 +++---
src/roff/groff/Makefile.sub | 4 ++--
src/roff/grog/Makefile.sub | 6 +++---
src/roff/nroff/Makefile.sub | 4 ++--
src/roff/troff/Makefile.sub | 2 +-
src/utils/afmtodit/Makefile.sub | 8 ++++----
src/utils/indxbib/Makefile.sub | 2 +-
tmac/Makefile.sub | 14 +++++++-------
38 files changed, 138 insertions(+), 123 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 437dbe4..ffe8e39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-03-30 Steffen Nurpmeso <address@hidden>
+ * */Makefile.*: Put straight error-prevention prefixes for `rm'.
+
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
`uninstall' target: Avoid spurious and misleading error messages.
* Makefile.comm (uninstall_dev): Improve.
diff --git a/Makefile.comm b/Makefile.comm
index 983641a..adeddcd 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -67,7 +67,7 @@ fonts:
.PHONY: pure fonts
mostlyclean:
- -rm -f $(MOSTLYCLEANFILES)
+ rm -f $(MOSTLYCLEANFILES)
-rm -rf $(MOSTLYCLEANDIRADD)
address@hidden test `cd $(srcdir); pwd` = `pwd`; then \
:; \
@@ -76,10 +76,10 @@ mostlyclean:
fi
clean: mostlyclean
- -rm -f $(CLEANFILES)
+ rm -f $(CLEANFILES)
distclean: clean
- -rm -f $(DISTCLEANFILES)
+ rm -f $(DISTCLEANFILES)
address@hidden test `cd $(srcdir); pwd` = `pwd`; then \
:; \
else \
@@ -87,10 +87,10 @@ distclean: clean
fi
realclean: distclean
- -rm -f $(REALCLEANFILES)
+ rm -f $(REALCLEANFILES)
extraclean: distclean
- -rm -f \#* *~ =* core junk grot old temp tmp tem *.new *.old *.orig
+ rm -f \#* *~ =* core junk grot old temp tmp tem *.new *.old *.orig
.SUFFIXES:
.SUFFIXES: .o .obj .cpp .c .y .man .n
@@ -117,7 +117,7 @@ extraclean: distclean
-test -f y.tab.c && mv y.tab.c y_tab.c
sed "s/^#line \(.*\) \"y.tab.c\"/#line \1 \"$(YTABC)\"/" \
< y_tab.c > $(YTABC)
- -rm -f y_tab.c
+ rm -f y_tab.c
test -z "$(YTABH)" || mv y_tab.h $(YTABH)
# The next rule is needed for make of Solaris 2.5.1 to override its
@@ -136,7 +136,7 @@ extraclean: distclean
.man.n:
@echo Making $@ from $<
- @-rm -f $@
+ @rm -f $@
@LC_ALL=C sed -e "s|@APPRESDIR@|$(appresdir)|g" \
-e "s|@BINDIR@|$(bindir)|g" \
-e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \
@@ -228,7 +228,7 @@ install_prog:
.PHONY: uninstall_prog
uninstall_prog:
- -rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
+ rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
.PHONY: install_dev
install_dev:
@@ -337,7 +337,7 @@ TAGS_src:
# This rule is only considered for the subdir_Makefile target.
Makefile:
- -rm -f Makefile
+ rm -f Makefile
echo srcdir=$(srcdir) >>Makefile
echo VPATH=$(VPATH) >>Makefile
cat $(MAKEFILEPARTS) /dev/null >>Makefile
diff --git a/Makefile.in b/Makefile.in
index 1b49423..a892510 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -948,7 +948,7 @@ uninstall: uninstall_sub uninstall_dirs
.PHONY: uninstall_dirs
# Use `rmdir' here so that the directories are only removed if they are empty.
uninstall_dirs:
- -rm -f $(DESTDIR)$(dataprogramdir)/current
+ rm -f $(DESTDIR)$(dataprogramdir)/current
-rmdir \
$(DESTDIR)$(man1dir) \
$(DESTDIR)$(man5dir) \
@@ -1001,7 +1001,7 @@ check:
# @echo "## All variables above are generated by configure. Do not edit!
##" >> site.tmp
# @test ! -f site.exp \
# || sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
-# @-rm -f site.bak
+# @rm -f site.bak
# @test ! -f site.exp || mv site.exp site.bak
# @mv site.tmp site.exp
diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub
index 0a3267a..8454b4e 100644
--- a/contrib/eqn2graph/Makefile.sub
+++ b/contrib/eqn2graph/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2006, 2009
+# Copyright (C) 2002, 2006, 2009, 2014
# Free Software Foundation, Inc.
#
# This file is part of groff.
@@ -32,8 +32,8 @@ eqn2graph: eqn2graph.sh
install_data: eqn2graph
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- -rm -f $(DESTDIR)$(bindir)/eqn2graph
+ rm -f $(DESTDIR)$(bindir)/eqn2graph
$(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph
uninstall_sub:
- -rm -f $(DESTDIR)$(bindir)/eqn2graph
+ rm -f $(DESTDIR)$(bindir)/eqn2graph
diff --git a/contrib/gdiffmk/ChangeLog b/contrib/gdiffmk/ChangeLog
index 5fd4dc0..f25ff63 100644
--- a/contrib/gdiffmk/ChangeLog
+++ b/contrib/gdiffmk/ChangeLog
@@ -1,6 +1,10 @@
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
+ * Makefile.sub: Put straight error-prevention prefixes for `rm'.
+
2009-09-22 Colin Watson <address@hidden>
- * contrib/gdiffmk/gdiffmk.sh: Don't use bash specific syntax.
+ * gdiffmk.sh: Don't use bash specific syntax.
2008-01-04 Werner LEMBERG <address@hidden>
@@ -22,9 +26,9 @@
2005-05-16 Keith Marshall <address@hidden>
- * contrib/gdiffmk/gdiffmk.sh: Add space in shebang, conforming
+ * gdiffmk.sh: Add space in shebang, conforming
to portability recommendation in autoconf docs.
- * contrib/gdiffmk/tests/runtests.in: Likewise.
+ * tests/runtests.in: Likewise.
2005-01-16 Mike Bianchi <address@hidden>
@@ -90,7 +94,7 @@
First import of gdiffmk files.
-Copyright 2004, 2005, 2006, 2007, 2008, 2009
+Copyright 2004-2009, 2014
Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/contrib/gdiffmk/Makefile.sub b/contrib/gdiffmk/Makefile.sub
index 0116266..02e0465 100644
--- a/contrib/gdiffmk/Makefile.sub
+++ b/contrib/gdiffmk/Makefile.sub
@@ -38,8 +38,8 @@ gdiffmk: gdiffmk.sh
install_data: gdiffmk
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- -rm -f $(DESTDIR)$(bindir)/gdiffmk
+ rm -f $(DESTDIR)$(bindir)/gdiffmk
$(INSTALL_SCRIPT) gdiffmk $(DESTDIR)$(bindir)/gdiffmk
uninstall_sub:
- -rm -f $(DESTDIR)$(bindir)/gdiffmk
+ rm -f $(DESTDIR)$(bindir)/gdiffmk
diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 956bdc7..7cdd6c4 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,5 +1,9 @@
2014-03-30 Steffen Nurpmeso <address@hidden>
+ * Makefile.sub: Put straight error-prevention prefixes for `rm'.
+
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
* Makefile.sub (uninstall_sub): Typo.
2014-03-11 Ingo Schwarze <address@hidden> (tiny change)
diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub
index 5b811bf..953725c 100644
--- a/contrib/glilypond/Makefile.sub
+++ b/contrib/glilypond/Makefile.sub
@@ -7,7 +7,7 @@
# Written by Werner Lemberg <address@hidden> and
# Bernd Warken <address@hidden>.
-# Last update: 30 Mar 2013
+# Last update: 30 Mar 2014
# This file is part of `glilypond' which is part of `groff'.
@@ -68,8 +68,8 @@ install_data: glilypond $(GLILYPOND_LIB)
uninstall_sub:
$(RM) $(DESTDIR)$(bindir)/glilypond;
- for f in $(GLILYPOND_LIB_); do \
- $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
+ -for f in $(GLILYPOND_LIB_); do \
+ $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
done
-rmdir $(DESTDIR)$(glilypond_dir)
diff --git a/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub
index dec9f6d..5a48dc8 100644
--- a/contrib/grap2graph/Makefile.sub
+++ b/contrib/grap2graph/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2006, 2009
+# Copyright (C) 2003, 2006, 2009, 2014
# Free Software Foundation, Inc.
#
# This file is part of groff.
@@ -32,8 +32,8 @@ grap2graph: grap2graph.sh
install_data: grap2graph
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- -rm -f $(DESTDIR)$(bindir)/grap2graph
+ rm -f $(DESTDIR)$(bindir)/grap2graph
$(INSTALL_SCRIPT) grap2graph $(DESTDIR)$(bindir)/grap2graph
uninstall_sub:
- -rm -f $(DESTDIR)$(bindir)/grap2graph
+ rm -f $(DESTDIR)$(bindir)/grap2graph
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index ad17574..d0f7b26 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,5 +1,9 @@
2014-03-30 Steffen Nurpmeso <address@hidden>
+ * Makefile.sub: Put straight error-prevention prefixes for `rm'.
+
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
* Makefile.sub (uninstall_sub): Typo.
2014-03-27 Werner LEMBERG <address@hidden>
@@ -374,7 +378,7 @@
________________________________________________________________
License
-Copyright (C) 2006-2009, 2011
+Copyright (C) 2006-2009, 2011-2014
Free Software Foundation, Inc.
Written by Bernd Warken <address@hidden>.
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index e98b7bd..081a207 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -105,10 +105,10 @@ install_data: groffer
uninstall_sub:
$(RM) $(DESTDIR)$(bindir)/groffer
- for f in $(ROFF2PROGS); do $(RM) $(DESTDIR)$(bindir)/$$f; done
- for f in $(GROFFER_PERL) version.sh; do \
- $(RM) $(DESTDIR)$(groffer_dir)/$$f; \
- done
+ -for f in $(ROFF2PROGS); do $(RM) $(DESTDIR)$(bindir)/$$f; done
+ -for f in $(GROFFER_PERL) version.sh; do \
+ $(RM) $(DESTDIR)$(groffer_dir)/$$f;\
+ done
-rmdir $(DESTDIR)$(libdir)/groff/groffer
########################################################################
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 0cac28b..c06c20d 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 30 21:45:00 2014 Steffen Nurpmeso <address@hidden>
+
+ * Makefile.sim, Makefile.sub: Put straight error-prevention prefixes
+ for `rm'.
+
Wed Mar 6 22:18:00 2013 Deri James <address@hidden>
* groff_mm.man: Document .PIC flag -B (box). Default position of
@@ -935,7 +940,7 @@ Sun Jan 1 00:00:00 1991 Joergen Haegg (jh at efd.lth.se)
* TP&PX supported
* warnings for unimplemented macros
-Copyright 1991-2007, 2009-2013
+Copyright 1991-2007, 2009-2014
Free Software Foundation, Inc.
Copying and distribution of this file, with or without modification,
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index adfc3bb..31b8cd1 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,4 +1,4 @@
-# Copyright 1991, 1993, 2000, 2001, 2009
+# Copyright 1991, 1993, 2000, 2001, 2009, 2014
#
# This file is part of groff.
#
@@ -56,7 +56,7 @@ uninstall: groff_mm.n groff_mmse.n
.man.n:
@echo Making $@ from $<
- @-rm -f $@
+ @rm -f $@
@sed -e "s|@HYPHENFILE@|$(hyphenfile)|g" \
-e "s|@FONTDIR@|$(fontdir)|g" \
-e "s|@FONTPATH@|$(fontpath)|g" \
diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
index cbb9a97..4deabd4 100644
--- a/contrib/mm/Makefile.sub
+++ b/contrib/mm/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011, 2013
+# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011, 2013, 2014
# Free Software Foundation, Inc.
#
# Last update: 15 Apr 2013
@@ -39,21 +39,20 @@ install_bin: install_mmroff
install_data: install_m
-test -d $(DESTDIR)$(tmacdir)/mm \
|| $(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
- -for f in $(FILES); do \
- rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
- $(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f; \
+ for f in $(FILES); do \
+ rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
+ $(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f; \
done
- -for f in $(LOCALE); do \
- test -f $(DESTDIR)$(tmacdir)/mm/$$f \
- || touch $(DESTDIR)$(tmacdir)/mm/$$f; \
+ for f in $(LOCALE); do \
+ test -f $(DESTDIR)$(tmacdir)/mm/$$f \
+ || touch $(DESTDIR)$(tmacdir)/mm/$$f; \
done
$(INSTALL_DATA) $(srcdir)/refer-mm.tmac
$(DESTDIR)$(tmacdir)/refer-mm.tmac
install_m:
- -test -d $(DESTDIR)$(tmacdir) \
- || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
- -rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
+ -test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
+ rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
$(INSTALL_DATA) $(srcdir)/m.tmac \
$(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
@sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
@@ -65,7 +64,7 @@ install_m:
install_mmroff: mmroff
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- -rm -f $(DESTDIR)$(bindir)/mmroff
+ rm -f $(DESTDIR)$(bindir)/mmroff
$(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff
mmroff: mmroff.pl
@@ -81,11 +80,11 @@ uninstall_sub:
test -s $(DESTDIR)$(tmacdir)/mm/$$f \
|| rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
done
- -rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac
- -rm -f $(DESTDIR)$(tmacdir)/refer-mm.tmac
+ rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac
+ rm -f $(DESTDIR)$(tmacdir)/refer-mm.tmac
-rmdir $(DESTDIR)$(tmacdir)/mm
- -rm -f $(DESTDIR)$(bindir)/mmroff
+ rm -f $(DESTDIR)$(bindir)/mmroff
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index 9f06f13..366fa8b 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-30 Steffen Nurpmeso <address@hidden>
+
+ Makefile.sub: Put straight error-prevention prefixes for `rm'.
+
2014-03-29 Steffen Nurpmeso <address@hidden>
* Makefile.sub: Handle examples separately, controlled by
diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub
index ada32b9..a804a09 100644
--- a/contrib/pdfmark/Makefile.sub
+++ b/contrib/pdfmark/Makefile.sub
@@ -114,14 +114,8 @@ install_pdfdoc: install_always
uninstall_sub: uninstall_always $(make_uninstall_pdfdoc)
uninstall_always:
- for f in $(CMDFILES); do \
- $(RM) $(DESTDIR)$(bindir)/$$f; \
- done
- for f in $(TMACFILES); do \
- $(RM) $(DESTDIR)$(tmacdir)/$$f; \
- done
+ -for f in $(CMDFILES); do $(RM) $(DESTDIR)$(bindir)/$$f; done
+ -for f in $(TMACFILES); do $(RM) $(DESTDIR)$(tmacdir)/$$f; done
uninstall_pdfdoc: uninstall_always
- for f in $(PDFDOCFILES); do \
- $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \
- done
+ -for f in $(PDFDOCFILES); do $(RM) $(DESTDIR)$(pdfdocdir)/$$f; done
diff --git a/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub
index 6deea79..8f33559 100644
--- a/contrib/pic2graph/Makefile.sub
+++ b/contrib/pic2graph/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2006, 2009
+# Copyright (C) 2001, 2006, 2009, 2014
# Free Software Foundation, Inc.
#
# This file is part of groff.
@@ -32,8 +32,8 @@ pic2graph: pic2graph.sh
install_data: pic2graph
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- -rm -f $(DESTDIR)$(bindir)/pic2graph
+ rm -f $(DESTDIR)$(bindir)/pic2graph
$(INSTALL_SCRIPT) pic2graph $(DESTDIR)$(bindir)/pic2graph
uninstall_sub:
- -rm -f $(DESTDIR)$(bindir)/pic2graph
+ rm -f $(DESTDIR)$(bindir)/pic2graph
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 15087de..7c09e1c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -144,17 +144,17 @@ split-html:
clean:
- -rm -f *.ps *.html *.txt core
- -rm -f *.aux *.dvi *.pdf *.log *.toc texput.log
- -rm -f *.cp *.cps *.cv *.cn *.es *.ess *.fn *.fns *.ky *.kys \
- *.ma *.mas *.op *.ops *.pg *.pgs *.rq *.rqs *.st *.sts \
- *.tp *.tps *.tr *.vr *.vrs *.xhtml
+ rm -f *.ps *.html *.txt core
+ rm -f *.aux *.dvi *.pdf *.log *.toc texput.log
+ rm -f *.cp *.cps *.cv *.cn *.es *.ess *.fn *.fns *.ky *.kys \
+ *.ma *.mas *.op *.ops *.pg *.pgs *.rq *.rqs *.st *.sts \
+ *.tp *.tps *.tr *.vr *.vrs *.xhtml
-rm -rf img
distclean: clean
realclean: distclean
- -rm -f *.png *.eps
+ rm -f *.png *.eps
extraclean: distclean
- -rm -f core *~ \#* junk temp grot
+ rm -f core *~ \#* junk temp grot
diff --git a/font/devcp1047/Makefile.sub b/font/devcp1047/Makefile.sub
index 5aa6cff..f3551fd 100644
--- a/font/devcp1047/Makefile.sub
+++ b/font/devcp1047/Makefile.sub
@@ -9,7 +9,7 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
- @-rm -f $@
+ @rm -f $@
@(charwidth=`expr $(RES) / $(CPI)` ; \
sed -e "s/^name [A-Z]*$$/name $@/" \
-e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
diff --git a/font/devdvi/generate/Makefile b/font/devdvi/generate/Makefile
index 24668a3..38a182a 100644
--- a/font/devdvi/generate/Makefile
+++ b/font/devdvi/generate/Makefile
@@ -197,9 +197,9 @@ HBITC: $(srcdir)/tc.map
clean:
realclean:
- -rm -f $(FONTS)
+ rm -f $(FONTS)
extraclean: realclean
- -rm -f core *~ "#*"
+ rm -f core *~ "#*"
.PHONY: clean realclean extraclean all
diff --git a/font/devhtml/Makefile.sub b/font/devhtml/Makefile.sub
index 36fcf77..aedbc6c 100644
--- a/font/devhtml/Makefile.sub
+++ b/font/devhtml/Makefile.sub
@@ -10,7 +10,7 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
- @-rm -f $@
+ @rm -f $@
@(charwidth=`expr $(RES) / $(CPI)` ; \
sed -e "s/^name [A-Z]*$$/name $@/" \
-e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
@@ -25,7 +25,7 @@ $(FONTS): R.proto
DESC: DESC.proto
@echo Making $@
- @-rm -f $@
+ @rm -f $@
@sed -e "s/^res .*$$/res $(RES)/" \
-e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
-e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
diff --git a/font/devlatin1/Makefile.sub b/font/devlatin1/Makefile.sub
index b261f57..29414ba 100644
--- a/font/devlatin1/Makefile.sub
+++ b/font/devlatin1/Makefile.sub
@@ -9,7 +9,7 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
- @-rm -f $@
+ @rm -f $@
@(charwidth=`expr $(RES) / $(CPI)` ; \
sed -e "s/^name [A-Z]*$$/name $@/" \
-e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
diff --git a/font/devlj4/generate/Makefile b/font/devlj4/generate/Makefile
index 7c6d7f4..8f226f7 100644
--- a/font/devlj4/generate/Makefile
+++ b/font/devlj4/generate/Makefile
@@ -257,9 +257,9 @@ WINGDINGS: $(AUTOFONT)/9nb00095.tfm $(WINGDINGSMAP)
clean:
realclean:
- -rm -f $(FONTS)
+ rm -f $(FONTS)
extraclean: realclean
- -rm -f core *~ "#*"
+ rm -f core *~ "#*"
.PHONY: clean realclean extraclean all
diff --git a/font/devpdf/Makefile.sub b/font/devpdf/Makefile.sub
index 3d5baa2..53973d8 100644
--- a/font/devpdf/Makefile.sub
+++ b/font/devpdf/Makefile.sub
@@ -54,14 +54,14 @@ RM=rm -f
all: DESC
DESC: DESC.in
- -rm -f DESC
+ rm -f DESC
cat $(srcdir)/DESC.in >$(top_builddir)/font/devpdf/DESC
if test "$(PAGE)" = A4; then \
echo "papersize a4" >>$(top_builddir)/font/devpdf/DESC; \
else \
echo "papersize letter" >>$(top_builddir)/font/devpdf/DESC; \
fi
- -rm -f Foundry
+ rm -f Foundry
cat $(srcdir)/Foundry.in >$(top_builddir)/font/devpdf/Foundry
-test -d $(top_builddir)/font/devpdf/enc \
|| $(mkinstalldirs) $(top_builddir)/font/devpdf/enc
@@ -120,7 +120,7 @@ install_data:
done
uninstall_sub:
- for f in $(MOSTLYCLEANADD); do \
+ -for f in $(MOSTLYCLEANADD); do \
$(RM) $(DESTDIR)$(fontsubdir)/$$f; \
done
-d="$(DESTDIR)$(fontsubdir)/enc"; \
diff --git a/font/devps/Makefile.sub b/font/devps/Makefile.sub
index e4aa038..42d92ad 100644
--- a/font/devps/Makefile.sub
+++ b/font/devps/Makefile.sub
@@ -55,5 +55,5 @@ zapfdr.pfa: zapfdr.ps
symbolsl.pfa: symbolsl.ps
$(PSFILES):
- -rm -f $@
+ rm -f $@
sed -f $(srcdir)/psstrip.sed $? >$@
diff --git a/font/devps/generate/Makefile b/font/devps/generate/Makefile
index fe7d5b9..4d3ff79 100644
--- a/font/devps/generate/Makefile
+++ b/font/devps/generate/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2000, 2002, 2003, 2006, 2009
+# Copyright (C) 1989-2000, 2002, 2003, 2006, 2009, 2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
#
@@ -219,17 +219,16 @@ symbol.afm: $(srcdir)/symbol.sed
sed -f $(srcdir)/symbol.sed `$(AFMNAME) $(afmdir)/Symbol.afm` >$@
symbolsl.afm: $(srcdir)/symbolsl.awk $(srcdir)/../symbolsl.ps
- -rm -f $@
- -rm -f Fontmap
+ rm -f $@ Fontmap
echo "/Symbol-Slanted ($(srcdir)/../symbolsl.ps) ;" > Fontmap
echo "/Symbol ($(symbolfont)) ;" >> Fontmap
$(PRINTAFM) Symbol-Slanted > tmp.afm
awk -f $(srcdir)/symbolsl.awk -v SYMAFM=`$(AFMNAME) \
$(afmdir)/Symbol.afm` tmp.afm >$@
- -rm -f Fontmap tmp.afm
+ rm -f Fontmap tmp.afm
zapfdr.afm: $(srcdir)/zapfdr.sed
- -rm -f $@
+ rm -f $@
sed -f $(srcdir)/zapfdr.sed \
`$(AFMNAME) $(afmdir)/ZapfDingbats.afm` >$@
@@ -247,13 +246,13 @@ symbolmap: $(TEXTMAP) $(srcdir)/symbolchars
cat $(TEXTMAP) $(srcdir)/symbolchars >>$@
clean:
- -rm -f symbolmap symbol.afm
+ rm -f symbolmap symbol.afm
realclean: clean
- -rm -f $(FONTS)
+ rm -f $(FONTS)
extraclean: realclean
- -rm -f core *~ "#*"
+ rm -f core *~ "#*"
.PHONY: all clean realclean extraclean
diff --git a/font/devutf8/Makefile.sub b/font/devutf8/Makefile.sub
index f27663e..9150c54 100644
--- a/font/devutf8/Makefile.sub
+++ b/font/devutf8/Makefile.sub
@@ -9,7 +9,7 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
- @-rm -f $@
+ @rm -f $@
@(charwidth=`expr $(RES) / $(CPI)` ; \
sed -e "s/^name [A-Z]*$$/name $@/" \
-e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
diff --git a/src/devices/gropdf/Makefile.sub b/src/devices/gropdf/Makefile.sub
index 96aa467..329d4d2 100644
--- a/src/devices/gropdf/Makefile.sub
+++ b/src/devices/gropdf/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2013
+# Copyright (C) 2011-2014
# Free Software Foundation, Inc.
# Written by Deri James <address@hidden>
#
@@ -61,6 +61,4 @@ install_data:
done
uninstall_sub:
- for f in $(CMDFILES); do \
- $(RM) $(DESTDIR)$(bindir)/$$f; \
- done
+ -for f in $(CMDFILES); do $(RM) $(DESTDIR)$(bindir)/$$f; done
diff --git a/src/devices/xditview/Makefile.sub
b/src/devices/xditview/Makefile.sub
index 927807e..dccda2a 100644
--- a/src/devices/xditview/Makefile.sub
+++ b/src/devices/xditview/Makefile.sub
@@ -53,5 +53,5 @@ install_data: $(srcdir)/GXditview.ad
$(srcdir)/GXditview-color.ad
$(DESTDIR)$(appresdir)/GXditview-color
uninstall_sub:
- -rm -f $(DESTDIR)$(appresdir)/GXditview
- -rm -f $(DESTDIR)$(appresdir)/GXditview-color
+ rm -f $(DESTDIR)$(appresdir)/GXditview
+ rm -f $(DESTDIR)$(appresdir)/GXditview-color
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index bbdd447..c6c9936 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -153,7 +153,7 @@ MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs
install_data: install_charset_data
install_charset_data:
- test $(GLIBC21) != no || $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+ -test $(GLIBC21) != no || $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
if test -f $(DESTDIR)$(libdir)/charset.alias; then \
sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias \
> $(DESTDIR)$(libdir)/t-charset.alias; \
diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub
index a009896..f710700 100644
--- a/src/preproc/eqn/Makefile.sub
+++ b/src/preproc/eqn/Makefile.sub
@@ -46,15 +46,15 @@ MOSTLYCLEANADD=neqn
all: neqn
neqn: neqn.sh $(SH_DEPS_SED_SCRIPT)
- -rm -f $@
+ rm -f $@
sed -e 's/@g@/$(g)/g' \
-f $(SH_DEPS_SED_SCRIPT) \
-e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >$@
chmod +x $@
install_data: neqn
- -rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
+ rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
$(INSTALL_SCRIPT) neqn $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
uninstall_sub:
- -rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
+ rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index e43c3f6..7fd23c9 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -70,8 +70,8 @@ install_data: $(GROFF_OPTS_OUTPUT)
done
uninstall_sub:
- for f in $(GROFF_OPTS_OUTPUT); do \
- $(RM) $(DESTDIR)$(libprogramdir)/$$f; \
+ -for f in $(GROFF_OPTS_OUTPUT); do \
+ $(RM) $(DESTDIR)$(libprogramdir)/$$f;\
done
# XXX This will be removed by `uninstall_dirs' in `$(top_srcdir)/Makefile.in'
# XXX (And only from there it is successful on an empty directory)
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index e6a568e..a0d4893 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -41,7 +41,7 @@ GROG_=`echo $(GROG) | sed 's|$(srcdir)/||g'`
# Perl version works for all parts of `groff'.
grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
- -$(RM) "$@";
+ $(RM) $@
sed -f "$(SH_DEPS_SED_SCRIPT)" \
-e "1s|^\(#! \).*perl|\\1$(PERL)|" \
-e "s|@g@|$(g)|g" \
@@ -58,7 +58,7 @@ grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
install_data: grog
-test -d "$(DESTDIR)$(bindir)" || \
$(mkinstalldirs) "$(DESTDIR)$(bindir)";
- -$(RM) "$(DESTDIR)$(bindir)/grog";
+ $(RM) $(DESTDIR)$(bindir)/grog
$(INSTALL_SCRIPT) grog "$(DESTDIR)$(bindir)/grog";
-test -d $(DESTDIR)$(grog_dir) || \
$(mkinstalldirs) "$(DESTDIR)$(grog_dir)";
@@ -70,7 +70,7 @@ install_data: grog
.PHONY: uninstall_data
uninstall_sub:
rm -f "$(DESTDIR)$(bindir)/grog"
- for f in $(GROG_); do \
+ -for f in $(GROG_); do \
$(RM) "$(DESTDIR)$(grog_dir)/$$f"; \
done
-d="$(DESTDIR)$(grog_dir)";\
diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub
index a682d85..b59e777 100644
--- a/src/roff/nroff/Makefile.sub
+++ b/src/roff/nroff/Makefile.sub
@@ -13,8 +13,8 @@ nroff: nroff.sh $(SH_DEPS_SED_SCRIPT)
install_data: nroff
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- -rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
+ rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
$(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
uninstall_sub:
- -rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
+ rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
index 782ef43..4bc2ae0 100644
--- a/src/roff/troff/Makefile.sub
+++ b/src/roff/troff/Makefile.sub
@@ -40,7 +40,7 @@ NAMEPREFIX=$(g)
majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
@echo Making $@
- @-rm -f $@
+ @rm -f $@
@echo const char \*major_version = \
\"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@
@echo const char \*minor_version = \
diff --git a/src/utils/afmtodit/Makefile.sub b/src/utils/afmtodit/Makefile.sub
index 948796d..141a7bc 100644
--- a/src/utils/afmtodit/Makefile.sub
+++ b/src/utils/afmtodit/Makefile.sub
@@ -1,7 +1,7 @@
-# Copyright (C) 2013
+# Copyright (C) 2013, 2014
# Free Software Foundation, Inc.
#
-# Last update: 15 Apr 2013
+# Last update: 30 Mar 2014
#
# This file is part of groff.
#
@@ -42,8 +42,8 @@ afmtodit: afmtodit.pl afmtodit.tables
install_data: afmtodit
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- -rm -f $(DESTDIR)$(bindir)/afmtodit
+ rm -f $(DESTDIR)$(bindir)/afmtodit
$(INSTALL_SCRIPT) afmtodit $(DESTDIR)$(bindir)/afmtodit
uninstall_sub:
- -rm -f $(DESTDIR)$(bindir)/afmtodit
+ rm -f $(DESTDIR)$(bindir)/afmtodit
diff --git a/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub
index 3b84008..d500679 100644
--- a/src/utils/indxbib/Makefile.sub
+++ b/src/utils/indxbib/Makefile.sub
@@ -29,4 +29,4 @@ install_data: $(srcdir)/eign
fi
uninstall_sub:
- -rm -f $(DESTDIR)$(common_words_file)
+ rm -f $(DESTDIR)$(common_words_file)
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 535f7ea..4031767 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2007, 2009-2012
+# Copyright (C) 1989-2007, 2009-2012, 2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
#
@@ -97,13 +97,13 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
rm -f $(DESTDIR)$(tmacdir)/$$f; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
done
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
$(INSTALL_DATA) $(srcdir)/s.tmac \
$(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
$(INSTALL_DATA) $(srcdir)/an.tmac \
$(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
- -rm -f $(DESTDIR)$(tmacdir)/www.tmac
+ rm -f $(DESTDIR)$(tmacdir)/www.tmac
$(INSTALL_DATA) www.tmac-sed $(DESTDIR)$(tmacdir)/www.tmac
for f in $(STRIPFILES); do \
rm -f $(DESTDIR)$(tmacdir)/$$f; \
@@ -155,9 +155,9 @@ uninstall_sub:
-for f in $(NORMALFILES) $(STRIPFILES); do \
rm -f $(DESTDIR)$(tmacdir)/$$f; \
done
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
- -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
- -rm -f $(DESTDIR)$(tmacdir)/www.tmac
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+ rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+ rm -f $(DESTDIR)$(tmacdir)/www.tmac
-if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
$(srcdir)/man.local; then \
rm -f $(DESTDIR)$(localtmacdir)/man.local; \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 07/09: * */Makefile.*: Put straight error-prevention prefixes for `rm'.,
Werner LEMBERG <=