[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 08/09: */Makefile.*: Put straight error-prevention prefixes for
|
From: |
Werner LEMBERG |
|
Subject: |
[groff] 08/09: */Makefile.*: Put straight error-prevention prefixes for `rm', part 2. |
|
Date: |
Sun, 30 Mar 2014 20:13:36 +0000 |
wl pushed a commit to branch master
in repository groff.
commit efc407da104b7882a8139b7ba4b1e2909dfded76
Author: Steffen Nurpmeso <address@hidden>
Date: Sun Mar 30 22:09:01 2014 +0200
*/Makefile.*: Put straight error-prevention prefixes for `rm', part 2.
---
Makefile.ccpg | 3 +-
Makefile.comm | 137 +++++++++++++++++-----------------
Makefile.cpg | 3 +-
Makefile.in | 6 +-
Makefile.man | 3 +-
Makefile.sub | 2 +-
arch/misc/Makefile.sub | 2 -
contrib/chem/Makefile.sub | 46 +++++-------
contrib/eqn2graph/Makefile.sub | 3 +-
contrib/gdiffmk/Makefile.sub | 7 +-
contrib/glilypond/Makefile.sub | 36 +++------
contrib/gperl/Makefile.sub | 18 +----
contrib/grap2graph/Makefile.sub | 3 +-
contrib/groff_filenames/Makefile.sub | 10 +--
contrib/groffer/Makefile.sub | 57 ++++++---------
contrib/hdtbl/Makefile.sub | 6 +-
contrib/mm/Makefile.sim | 45 +++++------
contrib/mm/Makefile.sub | 16 ++--
contrib/pdfmark/Makefile.sub | 17 ++---
contrib/pic2graph/Makefile.sub | 3 +-
doc/Makefile.in | 18 ++---
doc/Makefile.sub | 25 +++---
font/devascii/Makefile.sub | 20 +++---
font/devcp1047/Makefile.sub | 19 ++---
font/devdvi/generate/Makefile | 4 -
font/devhtml/Makefile.sub | 18 ++--
font/devlatin1/Makefile.sub | 19 ++---
font/devlbp/Makefile.sub | 3 +-
font/devlj4/Makefile.sub | 1 -
font/devlj4/generate/Makefile | 1 -
font/devpdf/Makefile.sub | 37 ++++-----
font/devps/Makefile.sub | 1 -
font/devps/generate/Makefile | 1 -
font/devutf8/Makefile.sub | 18 ++--
src/devices/gropdf/Makefile.sub | 12 +--
src/devices/xditview/Makefile.sub | 3 +-
src/libs/libgroff/Makefile.sub | 10 +-
src/preproc/eqn/Makefile.sub | 4 +-
src/roff/groff/Makefile.sub | 24 ++-----
src/roff/grog/Makefile.sub | 39 ++++------
src/roff/nroff/Makefile.sub | 4 +-
src/roff/troff/Makefile.sub | 5 +-
src/utils/afmtodit/Makefile.sub | 18 ++--
src/utils/indxbib/Makefile.sub | 4 +-
src/utils/xtotroff/Makefile.in | 8 +-
tmac/Makefile.sub | 13 ++--
46 files changed, 324 insertions(+), 428 deletions(-)
diff --git a/Makefile.ccpg b/Makefile.ccpg
index 8a34897..b6a3cde 100644
--- a/Makefile.ccpg
+++ b/Makefile.ccpg
@@ -44,7 +44,8 @@ TAGS_src: $(CCSRCS) $(CSRCS) $(GRAM) $(HDRS)
Makefile: $(MAKEFILEPARTS)
Makefile.dep:
touch Makefile.dep
-$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION
$(top_srcdir)/REVISION
+$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION \
+ $(top_srcdir)/REVISION
pure: $(PROG).pure
diff --git a/Makefile.comm b/Makefile.comm
index adeddcd..7d4b57c 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -137,87 +137,89 @@ extraclean: distclean
.man.n:
@echo Making $@ from $<
@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" \
- -e "s|@COMMON_WORDS_FILE@|$(common_words_file)|g" \
- -e "s|@DATASUBDIR@|$(datasubdir)|g" \
- -e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
- -e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \
- -e "s|@DEVICE@|$(DEVICE)|g" \
- -e "s|@DOCDIR@|$(docdir)|g" \
- -e "s|@EXAMPLEDIR@|$(exampledir)|g" \
- -e "s|@FONTDIR@|$(fontdir)|g" \
- -e "s|@g@|$(g)|g" \
- -e "address@hidden@!`echo $(g) | tr [a-z] [A-Z]`!g" \
- -e "s|@HTMLDOCDIR@|$(htmldocdir)|g" \
- -e "s|@INDEX_SUFFIX@|$(indexext)|g" \
- -e "s|@LEGACYFONTDIR@|$(legacyfontdir)|g" \
- -e "s|@LOCALFONTDIR@|$(localfontdir)|g" \
- -e "s|@LOCALMACRODIR@|$(localtmacdir)|g" \
- -e "s|@MACRODIR@|$(tmacdir)|g" \
- -e "s|@MAN1EXT@|$(man1ext)|g" \
- -e "s|@MAN5EXT@|$(man5ext)|g" \
- -e "s|@MAN7EXT@|$(man7ext)|g" \
- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
- -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \
- -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \
- -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \
- -e "s|@TMAC_AN_PREFIX@|$(tmac_an_prefix)|g" \
- -e "s|@TMAC_M_PREFIX@|$(tmac_m_prefix)|g" \
- -e "s|@TMAC_MDIR@|$(tmacdir)/mm|g" \
- -e "s|@TMAC_S_PREFIX@|$(tmac_s_prefix)|g" \
- -e "s|@VERSION@|$(version)$(revision)|g" \
- $< >$@
+ @LC_ALL=C \
+ sed -e "s|@APPRESDIR@|$(appresdir)|g" \
+ -e "s|@BINDIR@|$(bindir)|g" \
+ -e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \
+ -e "s|@COMMON_WORDS_FILE@|$(common_words_file)|g" \
+ -e "s|@DATASUBDIR@|$(datasubdir)|g" \
+ -e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
+ -e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \
+ -e "s|@DEVICE@|$(DEVICE)|g" \
+ -e "s|@DOCDIR@|$(docdir)|g" \
+ -e "s|@EXAMPLEDIR@|$(exampledir)|g" \
+ -e "s|@FONTDIR@|$(fontdir)|g" \
+ -e "s|@g@|$(g)|g" \
+ -e "address@hidden@!`echo $(g) | tr [a-z] [A-Z]`!g" \
+ -e "s|@HTMLDOCDIR@|$(htmldocdir)|g" \
+ -e "s|@INDEX_SUFFIX@|$(indexext)|g" \
+ -e "s|@LEGACYFONTDIR@|$(legacyfontdir)|g" \
+ -e "s|@LOCALFONTDIR@|$(localfontdir)|g" \
+ -e "s|@LOCALMACRODIR@|$(localtmacdir)|g" \
+ -e "s|@MACRODIR@|$(tmacdir)|g" \
+ -e "s|@MAN1EXT@|$(man1ext)|g" \
+ -e "s|@MAN5EXT@|$(man5ext)|g" \
+ -e "s|@MAN7EXT@|$(man7ext)|g" \
+ -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
+ -e "s|@OLDFONTDIR@|$(oldfontdir)|g" \
+ -e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \
+ -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \
+ -e "s|@TMAC_AN_PREFIX@|$(tmac_an_prefix)|g" \
+ -e "s|@TMAC_M_PREFIX@|$(tmac_m_prefix)|g" \
+ -e "s|@TMAC_MDIR@|$(tmacdir)/mm|g" \
+ -e "s|@TMAC_S_PREFIX@|$(tmac_s_prefix)|g" \
+ -e "s|@VERSION@|$(version)$(revision)|g" \
+ $< >$@
.PHONY: install_man
install_man:
-test -d $(DESTDIR)$(manroot) || $(mkinstalldirs) $(DESTDIR)$(manroot)
-test -d $(DESTDIR)$(man1dir) || $(mkinstalldirs) $(DESTDIR)$(man1dir)
@-pages="$(MAN1)"; \
- for p in $$pages; do \
- prog=`basename $$p .n`; \
- target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
- rm -f $$target; \
- echo $(INSTALL_DATA) $$p $$target; \
- $(INSTALL_DATA) $$p $$target; \
+ for p in $$pages; do \
+ prog=`basename $$p .n`; \
+ target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
+ rm -f $$target; \
+ echo $(INSTALL_DATA) $$p $$target; \
+ $(INSTALL_DATA) $$p $$target; \
done
-test -d $(DESTDIR)$(man5dir) || $(mkinstalldirs) $(DESTDIR)$(man5dir)
@-pages="$(MAN5)"; \
- for p in $$pages; do \
- target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
- rm -f $$target; \
- echo $(INSTALL_DATA) $$p $$target; \
- $(INSTALL_DATA) $$p $$target; \
+ for p in $$pages; do \
+ target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
+ rm -f $$target; \
+ echo $(INSTALL_DATA) $$p $$target; \
+ $(INSTALL_DATA) $$p $$target; \
done
-test -d $(DESTDIR)$(man7dir) || $(mkinstalldirs) $(DESTDIR)$(man7dir)
@-pages="$(MAN7)"; \
- for p in $$pages; do \
- target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
- rm -f $$target; \
- echo $(INSTALL_DATA) $$p $$target; \
- $(INSTALL_DATA) $$p $$target; \
+ for p in $$pages; do \
+ target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
+ rm -f $$target; \
+ echo $(INSTALL_DATA) $$p $$target; \
+ $(INSTALL_DATA) $$p $$target; \
done
.PHONY: uninstall_man
uninstall_man:
@-pages="$(MAN1)"; \
- for p in $$pages; do \
- target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext);
\
- echo rm -f $$target; \
- rm -f $$target; \
- done
+ for p in $$pages; do \
+ target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX); \
+ target=$$target`basename $$p .n`.$(man1ext); \
+ echo rm -f $$target; \
+ rm -f $$target; \
+ done
@-pages="$(MAN5)"; \
- for p in $$pages; do \
- target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
- echo rm -f $$target; \
- rm -f $$target; \
- done
+ for p in $$pages; do \
+ target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
+ echo rm -f $$target; \
+ rm -f $$target; \
+ done
@-pages="$(MAN7)"; \
- for p in $$pages; do \
- target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
- echo rm -f $$target; \
- rm -f $$target; \
+ for p in $$pages; do \
+ target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
+ echo rm -f $$target; \
+ rm -f $$target; \
done
.PHONY: install_prog
@@ -276,7 +278,8 @@ install_dev:
-test -z "$(OLDDEVFILES)" \
|| for f in ""$(OLDDEVFILES); do \
rm -f $(DESTDIR)$(oldfontsubdir)/$$f; \
- $(INSTALL_DATA) $(srcdir)/old/$$f
$(DESTDIR)$(oldfontsubdir)/$$f; \
+ $(INSTALL_DATA) $(srcdir)/old/$$f \
+ $(DESTDIR)$(oldfontsubdir)/$$f; \
done
-test -z "$(DEVSCRIPTS)" \
|| for f in ""$(DEVSCRIPTS); do \
@@ -315,14 +318,15 @@ depend_src: depend.temp
mv depend.temp Makefile.dep
depend.temp: FORCE
- > depend.temp;
+ > depend.temp
if test -f "$(srcdir)/$(YTABC)"; then \
ytabc="$(srcdir)/$(YTABC)"; \
else \
ytabc="$(YTABC)"; \
fi; \
test -z "$(CCSRCS)$(YTABC)" \
- || $(CCC) $(ALL_CCFLAGS) $(EXTRA_CCFLAGS) -MM $(CCSRCS) $$ytabc
>>depend.temp
+ || $(CCC) $(ALL_CCFLAGS) $(EXTRA_CCFLAGS) -MM $(CCSRCS) $$ytabc \
+ >>depend.temp
test -z "$(CSRCS)" \
|| $(CC) $(ALL_CFLAGS) $(EXTRA_CFLAGS) -MM $(CSRCS) >>depend.temp
test -z "$(YTABH)" \
@@ -337,8 +341,7 @@ TAGS_src:
# This rule is only considered for the subdir_Makefile target.
Makefile:
- rm -f Makefile
- echo srcdir=$(srcdir) >>Makefile
+ echo srcdir=$(srcdir) >Makefile
echo VPATH=$(VPATH) >>Makefile
cat $(MAKEFILEPARTS) /dev/null >>Makefile
diff --git a/Makefile.cpg b/Makefile.cpg
index e7f5eac..bcb020f 100644
--- a/Makefile.cpg
+++ b/Makefile.cpg
@@ -44,4 +44,5 @@ TAGS_src: $(CCSRCS) $(CSRCS) $(GRAM) $(HDRS)
Makefile: $(MAKEFILEPARTS)
Makefile.dep:
touch Makefile.dep
-$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION
$(top_srcdir)/REVISION
+$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION \
+ $(top_srcdir)/REVISION
diff --git a/Makefile.in b/Makefile.in
index a892510..f24c8f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -770,7 +770,6 @@ dodirs=$(ALLDIRS) $(OTHERDIRS) dot
# Default target for subdir_Makefile
subdir=src/roff/troff
-
$(TARGETS):
@$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(ALLDIRS)
@$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(OTHERDIRS) dot
@@ -829,7 +828,8 @@ $(CCPROGDIRS): FORCE $(LIBDIRS)
-f $(top_srcdir)/Makefile.ccpg \
-f Makefile.dep $(do)
-$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS)
$(CCPROGDIRS) $(CPROGDIRS)
+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE \
+ $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
@$(ENVSETUP); \
if test $(srcdir) = .; then \
srcdir=.; \
@@ -856,7 +856,7 @@ $(GNULIBDIRS): FORCE
cd $@; \
args=`$(top_builddir)/config.status --config`; \
test -f Makefile \
- || eval $$srcdir/configure "$$args" --srcdir=$$srcdir; \
+ || eval $$srcdir/configure "$$args" --srcdir=$$srcdir; \
$(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \
esac
diff --git a/Makefile.man b/Makefile.man
index 8417163..2f41967 100644
--- a/Makefile.man
+++ b/Makefile.man
@@ -23,4 +23,5 @@ all: $(MANPAGES)
install_data: install_man
install_man: $(MANPAGES)
uninstall_sub: uninstall_man
-$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION
$(top_srcdir)/REVISION
+$(top_builddir)/stamp-h $(MANPAGES): $(top_srcdir)/VERSION \
+ $(top_srcdir)/REVISION
diff --git a/Makefile.sub b/Makefile.sub
index cb6df43..f810de0 100644
--- a/Makefile.sub
+++ b/Makefile.sub
@@ -65,7 +65,7 @@ $(srcdir)/config.hin: stamp-h.in
$(srcdir)/stamp-h.in: configure.ac $(srcdir)/aclocal.m4
cd $(srcdir) && autoheader
echo timestamp > $(srcdir)/stamp-h.in
-
+
config.h: stamp-h
stamp-h: config.hin config.status
$(SHELL) config.status
diff --git a/arch/misc/Makefile.sub b/arch/misc/Makefile.sub
index 9f12153..5bce8ce 100644
--- a/arch/misc/Makefile.sub
+++ b/arch/misc/Makefile.sub
@@ -22,5 +22,3 @@ all: shdeps.sed
shdeps.sed: $(srcdir)/shdeps.sh
$(SHELL) $(srcdir)/shdeps.sh "$(RT_SEP)" "$(SH_SEP)" "$(bindir)" > $@
-
-# eof
diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index c893761..9f67cd0 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -32,9 +32,6 @@ MOSTLYCLEANADD=\
examples/README \
examples/122/README
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
all: README chem $(MAN1) $(make_examples)
README: $(srcdir)/README.txt
@@ -53,24 +50,25 @@ examples/122/README: $(srcdir)/examples/122/README.txt
sed -e "s|@g@|$(g)|g" $? >$@
chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
+ rm -f $@
sed -f "$(SH_DEPS_SED_SCRIPT)" \
- -e "s|@g@|$(g)|g" \
- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
- -e "s|@MACRODIR@|$(DESTDIR)$(tmacdir)|g" \
- -e "s|@PICDIR@|$(DESTDIR)$(datasubdir)/pic|g" \
- -e "s|@VERSION@|$(version)$(revision)|g" \
- -e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/chem.pl >$@
+ -e "s|@g@|$(g)|g" \
+ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
+ -e "s|@MACRODIR@|$(DESTDIR)$(tmacdir)|g" \
+ -e "s|@PICDIR@|$(DESTDIR)$(datasubdir)/pic|g" \
+ -e "s|@VERSION@|$(version)$(revision)|g" \
+ -e "$(SH_SCRIPT_SED_CMD)" \
+ $(srcdir)/chem.pl >$@
chmod +x $@
install_data: install_always $(make_install_examples)
install_always: chem README $(srcdir)/chem.pic
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- $(RM) $(DESTDIR)$(bindir)/$(g)chem
+ rm -f $(DESTDIR)$(bindir)/$(g)chem
$(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem
-test -d $(DESTDIR)$(datasubdir)/pic \
|| $(mkinstalldirs) $(DESTDIR)$(datasubdir)/pic
- $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
+ rm -f $(DESTDIR)$(datasubdir)/pic/chem.pic
$(INSTALL_DATA) $(srcdir)/chem.pic \
$(DESTDIR)$(datasubdir)/pic/chem.pic
@@ -82,32 +80,24 @@ install_examples: install_always examples
-find $(DESTDIR)$(exampledir)/chem -type f -exec rm -f '{}' ';'
$(INSTALL_DATA) examples/README $(DESTDIR)$(exampledir)/chem/README
for i in $(srcdir)/examples/*.chem; do \
- n=`echo $$i | sed 's|$(srcdir)/examples/||g'`; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \
+ n=`echo $$i | sed 's|$(srcdir)/examples/||g'`; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \
done
$(INSTALL_DATA) examples/122/README \
$(DESTDIR)$(exampledir)/chem/122/README
for i in $(srcdir)/examples/122/*.chem; do \
- n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n; \
+ n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n; \
done
uninstall_sub: uninstall_always $(make_uninstall_examples)
uninstall_always:
- $(RM) $(DESTDIR)$(bindir)/chem
- $(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
+ rm -f $(DESTDIR)$(bindir)/chem
+ rm -f $(DESTDIR)$(datasubdir)/pic/chem.pic
-rmdir $(DESTDIR)$(datasubdir)/pic
uninstall_examples: uninstall_always
- $(RM) $(DESTDIR)$(exampledir)/chem/122/*
+ rm -f $(DESTDIR)$(exampledir)/chem/122/*
-rmdir $(DESTDIR)$(exampledir)/chem/122
- $(RM) $(DESTDIR)$(exampledir)/chem/*
+ rm -f $(DESTDIR)$(exampledir)/chem/*
-rmdir $(DESTDIR)$(exampledir)/chem
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub
index 8454b4e..02567e6 100644
--- a/contrib/eqn2graph/Makefile.sub
+++ b/contrib/eqn2graph/Makefile.sub
@@ -24,10 +24,9 @@ MOSTLYCLEANADD=eqn2graph
all: eqn2graph
eqn2graph: eqn2graph.sh
- rm -f $@; \
sed -e "s|@g@|$(g)|g" \
-e "s|@VERSION@|$(version)$(revision)|" \
- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/eqn2graph.sh >$@; \
+ -e $(SH_SCRIPT_SED_CMD) $(srcdir)/eqn2graph.sh >$@
chmod +x $@
install_data: eqn2graph
diff --git a/contrib/gdiffmk/Makefile.sub b/contrib/gdiffmk/Makefile.sub
index 02e0465..1b5ddc6 100644
--- a/contrib/gdiffmk/Makefile.sub
+++ b/contrib/gdiffmk/Makefile.sub
@@ -30,10 +30,9 @@ MOSTLYCLEANADD=gdiffmk tests/runtests
all: gdiffmk
gdiffmk: gdiffmk.sh
- rm -f $@; \
- sed -e "s|@BINDIR@|$(bindir)|g" \
- -e "s|@VERSION@|$(version)$(revision)|g" \
- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/gdiffmk.sh >$@; \
+ sed -e "s|@BINDIR@|$(bindir)|g" \
+ -e "s|@VERSION@|$(version)$(revision)|g" \
+ -e $(SH_SCRIPT_SED_CMD) $(srcdir)/gdiffmk.sh >$@
chmod +x $@
install_data: gdiffmk
diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub
index 953725c..9bd3eae 100644
--- a/contrib/glilypond/Makefile.sub
+++ b/contrib/glilypond/Makefile.sub
@@ -30,9 +30,6 @@ MAN1=glilypond.n
MOSTLYCLEANADD=glilypond $(MAN1)
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
all: glilypond
# files going to lib directory `$(glilypond_dir)'
@@ -46,37 +43,30 @@ GLILYPOND_LIB_=`echo $(GLILYPOND_LIB) | sed
's|$(srcdir)/||g'`
# create perl executable `glilypond', being stored into `bindir'
glilypond: $(srcdir)/glilypond.pl
+ rm -f $@
sed -f "$(SH_DEPS_SED_SCRIPT)" \
- -e "s|@g@|$(g)|g" \
- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
- -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \
- -e "s|@VERSION@|$(version)$(revision)|g" \
- $(srcdir)/glilypond.pl >$@
+ -e "s|@g@|$(g)|g" \
+ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
+ -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \
+ -e "s|@VERSION@|$(version)$(revision)|g" \
+ $(srcdir)/glilypond.pl >$@
chmod +x $@
install_data: glilypond $(GLILYPOND_LIB)
-test -d $(DESTDIR)$(bindir) \
- || $(mkinstalldirs) $(DESTDIR)$(bindir)
- $(RM) $(DESTDIR)$(bindir)/glilypond
+ || $(mkinstalldirs) $(DESTDIR)$(bindir)
+ rm -f $(DESTDIR)$(bindir)/glilypond
$(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond
-test -d $(DESTDIR)$(glilypond_dir) \
- || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir)
+ || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir)
for f in $(GLILYPOND_LIB_); do \
- $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
- $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(glilypond_dir)/$$f;
\
+ rm -f $(DESTDIR)$(glilypond_dir)/$$f; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(glilypond_dir)/$$f; \
done
uninstall_sub:
- $(RM) $(DESTDIR)$(bindir)/glilypond;
+ rm -f $(DESTDIR)$(bindir)/glilypond
-for f in $(GLILYPOND_LIB_); do \
- $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
+ rm -f $(DESTDIR)$(glilypond_dir)/$$f; \
done
-rmdir $(DESTDIR)$(glilypond_dir)
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/contrib/gperl/Makefile.sub b/contrib/gperl/Makefile.sub
index 947c5fe..7281250 100644
--- a/contrib/gperl/Makefile.sub
+++ b/contrib/gperl/Makefile.sub
@@ -30,14 +30,12 @@ MAN1=gperl.n
MOSTLYCLEANADD=gperl $(MAN1)
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
all: gperl
gperl: gperl.pl
+ rm -f $@
sed -f "$(SH_DEPS_SED_SCRIPT)" \
- -e "s|@g@|$(g)|g" \
+ -e "s|@g@|$(g)|g" \
-e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
-e "s|@VERSION@|$(version)$(revision)|g" \
-e "$(SH_SCRIPT_SED_CMD)" \
@@ -47,17 +45,9 @@ gperl: gperl.pl
.PHONY: install_data
install_data: gperl
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- $(RM) $(DESTDIR)$(bindir)/gperl
+ rm -f $(DESTDIR)$(bindir)/gperl
$(INSTALL_SCRIPT) gperl $(DESTDIR)$(bindir)/gperl
.PHONY: uninstall_sub
uninstall_sub:
- $(RM) $(DESTDIR)$(bindir)/gperl
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
+ rm -f $(DESTDIR)$(bindir)/gperl
diff --git a/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub
index 5a48dc8..bd08345 100644
--- a/contrib/grap2graph/Makefile.sub
+++ b/contrib/grap2graph/Makefile.sub
@@ -24,10 +24,9 @@ MOSTLYCLEANADD=grap2graph
all: grap2graph
grap2graph: grap2graph.sh
- rm -f $@; \
sed -e "s|@g@|$(g)|g" \
-e "s|@VERSION@|$(version)$(revision)|" \
- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grap2graph.sh >$@; \
+ -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grap2graph.sh >$@
chmod +x $@
install_data: grap2graph
diff --git a/contrib/groff_filenames/Makefile.sub
b/contrib/groff_filenames/Makefile.sub
index af8d400..f2b0222 100644
--- a/contrib/groff_filenames/Makefile.sub
+++ b/contrib/groff_filenames/Makefile.sub
@@ -1,4 +1,4 @@
-# Makefile.sub for `groiff_filenames' (integration into the `groff' source
tree)
+# Makefile.sub for `groff_filenames' (integration into the `groff' source tree)
# File position: <groff-source>/contrib/groff_filenames/Makefile.sub
@@ -30,11 +30,3 @@ MAN7=\
groff_filenames.n
MOSTLYCLEANADD=$(MAN7)
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index 081a207..d98b4d3 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -42,9 +42,6 @@ MAN1=groffer.n \
MOSTLYCLEANADD=groffer HAVE_PERL $(MAN1) $(ROFF2MAN) $(ROFF2PROGS)
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
all: groffer
GROFFER_PERL=func.pl \
@@ -58,18 +55,18 @@ GROFFER_REST=roff2.man \
roff2.pl
groffer: $(GROFFER_PERL) \
- $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
+ $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
if perl $(srcdir)/perl_test.pl 2>&1 >/dev/null; then \
: >HAVE_PERL; \
echo "Using perl version of groffer."; \
sed -f "$(SH_DEPS_SED_SCRIPT)" \
- -e "s|@g@|$(g)|g" \
- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
- -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
- -e "s|@VERSION@|$(version)$(revision)|g" \
- -e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/groffer.pl >$@; \
+ -e "s|@g@|$(g)|g" \
+ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
+ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
+ -e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
+ -e "s|@VERSION@|$(version)$(revision)|g" \
+ -e "$(SH_SCRIPT_SED_CMD)" \
+ $(srcdir)/groffer.pl >$@; \
for f in $(ROFF2PROGS); do \
cp $(srcdir)/roff2.pl $$f; \
done; \
@@ -82,39 +79,29 @@ groffer: $(GROFFER_PERL) \
install_data: groffer
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
- $(RM) $(DESTDIR)$(bindir)/groffer
+ rm -f $(DESTDIR)$(bindir)/groffer
$(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
for f in $(ROFF2PROGS); do \
- $(RM) $(DESTDIR)$(bindir)/$$f; \
+ rm -f $(DESTDIR)$(bindir)/$$f; \
$(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \
done
-test -d $(DESTDIR)$(groffer_dir) \
- || $(mkinstalldirs) $(DESTDIR)$(groffer_dir)
- $(RM) $(DESTDIR)$(groffer_dir)/version.sh
- $(INSTALL_DATA) $(srcdir)/version.sh \
- $(DESTDIR)$(groffer_dir)/version.sh
+ || $(mkinstalldirs) $(DESTDIR)$(groffer_dir)
+ rm -f $(DESTDIR)$(groffer_dir)/version.sh
+ $(INSTALL_DATA) $(srcdir)/version.sh $(DESTDIR)$(groffer_dir)/version.sh
for f in $(GROFFER_PERL); do \
- $(RM) $(DESTDIR)$(groffer_dir)/$$f; \
- done
+ rm -f $(DESTDIR)$(groffer_dir)/$$f; \
+ done
if test -f HAVE_PERL; then \
- for f in $(GROFFER_PERL); do \
- $(INSTALL_SCRIPT) $(srcdir)/$$f \
- $(DESTDIR)$(groffer_dir)/$$f; \
- done; \
- fi;
+ for f in $(GROFFER_PERL); do \
+ $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(groffer_dir)/$$f; \
+ done; \
+ fi
uninstall_sub:
- $(RM) $(DESTDIR)$(bindir)/groffer
- -for f in $(ROFF2PROGS); do $(RM) $(DESTDIR)$(bindir)/$$f; done
+ rm -f $(DESTDIR)$(bindir)/groffer
+ -for f in $(ROFF2PROGS); do rm -f $(DESTDIR)$(bindir)/$$f; done
-for f in $(GROFFER_PERL) version.sh; do \
- $(RM) $(DESTDIR)$(groffer_dir)/$$f;\
+ rm -f $(DESTDIR)$(groffer_dir)/$$f;\
done
-rmdir $(DESTDIR)$(libdir)/groff/groffer
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub
index 0493dd2..c85efb9 100644
--- a/contrib/hdtbl/Makefile.sub
+++ b/contrib/hdtbl/Makefile.sub
@@ -91,7 +91,7 @@ MOSTLYCLEANADD=\
.roff.ps:
$(GROFF) -Tps -dfontpath=$(top_srcdir)/font -dsopath=$(srcdir)/ \
- -mhdtbl $< >$@
+ -mhdtbl $< >$@
.in.roff:
sed -e "s|@fontdir@|$(fontdir)|" $< >$@
@@ -149,9 +149,7 @@ install_examples: install_always $(EXAMPLEFILES)
$(PROCESSEDEXAMPLEFILES) \
uninstall_sub: uninstall_always $(make_uninstall_examples)
uninstall_always:
- -for f in $(STRIPFILES); do \
- rm -f $(DESTDIR)$(tmacdir)/$$f; \
- done
+ -for f in $(STRIPFILES); do rm -f $(DESTDIR)$(tmacdir)/$$f; done
uninstall_examples: uninstall_always
-for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_) $(GENFILES_); do \
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index 31b8cd1..c132a8d 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -44,7 +44,6 @@ mdate = 2002-05-11
all:
-
install: groff_mm.n groff_mmse.n
$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
INSTALL_DATA='$(install)' tmac_m=$(tmac_m) install
@@ -53,30 +52,28 @@ uninstall: groff_mm.n groff_mmse.n
$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub
-
.man.n:
@echo Making $@ from $<
@rm -f $@
@sed -e "s|@HYPHENFILE@|$(hyphenfile)|g" \
- -e "s|@FONTDIR@|$(fontdir)|g" \
- -e "s|@FONTPATH@|$(fontpath)|g" \
- -e "s|@MACRODIR@|$(tmacdir)|g" \
- -e "s|@MACROPATH@|$(tmacpath)|g" \
- -e "s|@DEVICE@|$(DEVICE)|g" \
- -e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
- -e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \
- -e "s|@INDEX_SUFFIX@|$(indexext)|g" \
- -e "s|@COMMON_WORDS_FILE@|$(common_words_file)|g" \
- -e "s|@MAN1EXT@|$(man1ext)|g" \
- -e "s|@MAN5EXT@|$(man5ext)|g" \
- -e "s|@MAN7EXT@|$(man7ext)|g" \
- -e "s|@TMAC_S@|$(tmac_s)|g" \
- -e "s|@TMAC_M@|$(tmac_m)|g" \
- -e "s|@TMAC_MDIR@|$(tmacdir)/mm|g" \
- -e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \
- -e "s|@VERSION@|$(version)|g" \
- -e "s|@MDATE@|$(mdate)|g" \
- -e "s|@g@|$(g)|g" \
- -e "address@hidden@;`echo $(g) | tr [a-z] [A-Z]`!g" \
- $< >$@
-
+ -e "s|@FONTDIR@|$(fontdir)|g" \
+ -e "s|@FONTPATH@|$(fontpath)|g" \
+ -e "s|@MACRODIR@|$(tmacdir)|g" \
+ -e "s|@MACROPATH@|$(tmacpath)|g" \
+ -e "s|@DEVICE@|$(DEVICE)|g" \
+ -e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
+ -e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \
+ -e "s|@INDEX_SUFFIX@|$(indexext)|g" \
+ -e "s|@COMMON_WORDS_FILE@|$(common_words_file)|g" \
+ -e "s|@MAN1EXT@|$(man1ext)|g" \
+ -e "s|@MAN5EXT@|$(man5ext)|g" \
+ -e "s|@MAN7EXT@|$(man7ext)|g" \
+ -e "s|@TMAC_S@|$(tmac_s)|g" \
+ -e "s|@TMAC_M@|$(tmac_m)|g" \
+ -e "s|@TMAC_MDIR@|$(tmacdir)/mm|g" \
+ -e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \
+ -e "s|@VERSION@|$(version)|g" \
+ -e "s|@MDATE@|$(mdate)|g" \
+ -e "s|@g@|$(g)|g" \
+ -e "address@hidden@;`echo $(g) | tr [a-z] [A-Z]`!g" \
+ $< >$@
diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
index 4deabd4..aab1080 100644
--- a/contrib/mm/Makefile.sub
+++ b/contrib/mm/Makefile.sub
@@ -47,7 +47,8 @@ install_data: install_m
test -f $(DESTDIR)$(tmacdir)/mm/$$f \
|| touch $(DESTDIR)$(tmacdir)/mm/$$f; \
done
- $(INSTALL_DATA) $(srcdir)/refer-mm.tmac
$(DESTDIR)$(tmacdir)/refer-mm.tmac
+ $(INSTALL_DATA) $(srcdir)/refer-mm.tmac \
+ $(DESTDIR)$(tmacdir)/refer-mm.tmac
install_m:
-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
@@ -68,17 +69,14 @@ install_mmroff: mmroff
$(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff
mmroff: mmroff.pl
- -rm -f $@
- -sed -e 's;/usr/bin/perl;$(PERL);' $(srcdir)/mmroff.pl >$@
- -chmod +x $@
+ sed -e 's;/usr/bin/perl;$(PERL);' $(srcdir)/mmroff.pl >$@
+ chmod +x $@
uninstall_sub:
- -for f in $(FILES); do \
- rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
- done
+ -for f in $(FILES); do rm -f $(DESTDIR)$(tmacdir)/mm/$$f; done
-for f in $(LOCALE); do \
- test -s $(DESTDIR)$(tmacdir)/mm/$$f \
- || rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
+ 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
diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub
index a804a09..ffa402a 100644
--- a/contrib/pdfmark/Makefile.sub
+++ b/contrib/pdfmark/Makefile.sub
@@ -39,9 +39,6 @@ MOSTLYCLEANADD=\
$(CMDFILES) \
pdf[0-9]*
-# Some `makes' don't predefine RM...
-RM=rm -f
-
GROFF_BIN_DIR=$(top_builddir)/src/roff/groff
GROFF_OTHER_BIN_DIRS=\
$(top_builddir)/src/roff/troff \
@@ -62,7 +59,6 @@ PDFROFF=\
.SUFFIXES: .ms .pdf
.ms.pdf:
- $(RM) $@
$(PDFROFF) -mspdf --stylesheet=$(srcdir)/cover.ms $< >$@
all: pdfroff $(make_pdfdoc)
@@ -83,7 +79,6 @@ gnu.eps:
fi
pdfroff: pdfroff.sh $(SH_DEPS_SED_SCRIPT)
- $(RM) $@
sed -f $(SH_DEPS_SED_SCRIPT) \
-e "s|@VERSION@|$(version)$(revision)|" \
-e "s|@GROFF_AWK_INTERPRETERS@|$(ALT_AWK_PROGS)|" \
@@ -95,12 +90,12 @@ install_data: install_always $(make_install_pdfdoc)
install_always:
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
for f in $(CMDFILES); do \
- $(RM) $(DESTDIR)$(bindir)/$$f; \
+ rm -f $(DESTDIR)$(bindir)/$$f; \
$(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \
done
-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
for f in $(TMACFILES); do \
- $(RM) $(DESTDIR)$(tmacdir)/$$f; \
+ rm -f $(DESTDIR)$(tmacdir)/$$f; \
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
done
@@ -108,14 +103,14 @@ install_pdfdoc: install_always
-test -d $(DESTDIR)$(pdfdocdir) \
|| $(mkinstalldirs) $(DESTDIR)$(pdfdocdir)
for f in $(PDFDOCFILES); do \
- $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \
+ rm -f $(DESTDIR)$(pdfdocdir)/$$f; \
$(INSTALL_DATA) $$f $(DESTDIR)$(pdfdocdir)/$$f; \
done
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 -f $(DESTDIR)$(bindir)/$$f; done
+ -for f in $(TMACFILES); do rm -f $(DESTDIR)$(tmacdir)/$$f; done
uninstall_pdfdoc: uninstall_always
- -for f in $(PDFDOCFILES); do $(RM) $(DESTDIR)$(pdfdocdir)/$$f; done
+ -for f in $(PDFDOCFILES); do rm -f $(DESTDIR)$(pdfdocdir)/$$f; done
diff --git a/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub
index 8f33559..94b9f05 100644
--- a/contrib/pic2graph/Makefile.sub
+++ b/contrib/pic2graph/Makefile.sub
@@ -24,10 +24,9 @@ MOSTLYCLEANADD=pic2graph
all: pic2graph
pic2graph: pic2graph.sh
- rm -f $@; \
sed -e "s|@g@|$(g)|g" \
-e "s|@VERSION@|$(version)$(revision)|" \
- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/pic2graph.sh >$@; \
+ -e $(SH_SCRIPT_SED_CMD) $(srcdir)/pic2graph.sh >$@
chmod +x $@
install_data: pic2graph
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7c09e1c..54487d8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -93,7 +93,7 @@ imagedir=img
.ms.html:
$(GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -P-V -Thtml -ms >$@
+ -P-D$(imagedir) -P-V -Thtml -ms >$@
.ms.txt:
$(GROFF) -Tascii -ms -mwww >$@
.ms.ps:
@@ -107,8 +107,7 @@ imagedir=img
MAKEINFO=$(MAKEINFO) $(TEXI2DVI) -e --pdf $<
.texinfo.html:
LANG= $(MAKEINFO) --enable-encoding -I$(srcdir) --html --no-split $< \
- && $(SHELL) $(srcdir)/fixinfo.sh $@
-
+ && $(SHELL) $(srcdir)/fixinfo.sh $@
all: prepare_examples
@@ -124,13 +123,13 @@ gnu.eps: gnu.xpm
pic.html: pic.ms
$(GROFF) -P-p -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
- -Thtml -P-V -ms >$@
+ -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
+ -Thtml -P-V -ms >$@
webpage.html: webpage.ms gnu.eps groff.css
$(GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \
- -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -Thtml -ms >$@
+ -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
+ -P-D$(imagedir) -Thtml -ms >$@
webpage.ps: gnu.eps
@@ -138,10 +137,7 @@ grnexmpl.ps: grnexmpl.me grnexmpl.g
split-html:
LANG= $(MAKEINFO) --enable-encoding -I$(srcdir) --html groff.texinfo \
- && for f in groff/*; do \
- $(SHELL) $(srcdir)/fixinfo.sh $$f; \
- done
-
+ && for f in groff/*; do $(SHELL) $(srcdir)/fixinfo.sh $$f; done
clean:
rm -f *.ps *.html *.txt core
diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index f068e5c..9eaa187 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -117,13 +117,15 @@ MOSTLYCLEANNOTSRCDIRADD=\
.ms.html:
$(GROFF) -P-p -P-b -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -P-V -Thtml -ms >$@
+ -P-D$(imagedir) -P-V -Thtml -ms >$@
.ms.ps:
$(GROFF) -Tps -ms -mwww >$@
-
-all: $(make_otherdoc) $(make_infodoc) $(make_htmldoc) \
- $(make_examples) $(make_htmlexamples)
+all: $(make_otherdoc) \
+ $(make_infodoc) \
+ $(make_htmldoc) \
+ $(make_examples) \
+ $(make_htmlexamples)
otherdoc: $(PROCESSEDDOCFILES)
infodoc: groff.info
@@ -149,18 +151,18 @@ groff.info: groff.texinfo
$(MAKEINFO) --enable-encoding -I$(srcdir) $(srcdir)/groff.texinfo
gnu.eps: gnu.xpm
- xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | \
- $(pnmtops_nosetpage) -noturn -rle >$@
+ xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 \
+ | $(pnmtops_nosetpage) -noturn -rle >$@
pic.html: pic.ms
$(GROFF) -P-p -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
- -Thtml -P-V -ms >$@
+ -P-D$(imagedir) -P-j`basename $< | sed -e 's|.ms$$||'` \
+ -Thtml -P-V -ms >$@
webpage.html: webpage.ms gnu.eps groff.css
$(GROFF) -P-j`basename $< | sed -e 's|.ms$$||'` \
- -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
- -P-D$(imagedir) -Thtml -ms >$@
+ -P-nrpb -P-I`basename $< | sed -e 's|.ms$$||'` \
+ -P-D$(imagedir) -Thtml -ms >$@
webpage.ps: gnu.eps
@@ -218,8 +220,7 @@ install_examples_always: gnu.eps $(EXAMPLEFILES)
$(PROCESSEDEXAMPLEFILES)
# Prefer gnu.eps in builddir over srcdir.
-test -d $(DESTDIR)$(exampledir) \
|| $(mkinstalldirs) $(DESTDIR)$(exampledir)
- d=.; \
- test -f "gnu.eps" || d=$(srcdir); \
+ d=.; test -f "gnu.eps" || d=$(srcdir); \
rm -f $(DESTDIR)$(exampledir)/gnu.eps; \
$(INSTALL_DATA) $$d/gnu.eps $(DESTDIR)$(exampledir)/gnu.eps
for f in $(EXAMPLEFILES); do \
diff --git a/font/devascii/Makefile.sub b/font/devascii/Makefile.sub
index 0fa2e77..e8e9dfb 100644
--- a/font/devascii/Makefile.sub
+++ b/font/devascii/Makefile.sub
@@ -9,23 +9,23 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
- @-rm -f $@
- @(charwidth=`expr $(RES) / $(CPI)` ; \
- sed -e "s/^name [A-Z]*$$/name $@/" \
- -e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
+ @rm -f $@
+ @charwidth=`expr $(RES) / $(CPI)` ; \
+ sed -e "s/^name [A-Z]*$$/name $@/" \
+ -e \
+ "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \
-e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
-e "s/^internalname .*$$/internalname $@/" \
-e "/^internalname/s/BI/3/" \
-e "/^internalname/s/B/2/" \
-e "/^internalname/s/I/1/" \
-e "/^internalname .*[^ 0-9]/d" \
- $(srcdir)/R.proto >$@)
+ $(srcdir)/R.proto >$@
DESC: DESC.proto
@echo Making $@
- @-rm -f $@
@sed -e "s/^res .*$$/res $(RES)/" \
- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
- $(srcdir)/DESC.proto >$@
+ -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
+ -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
+ -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+ $(srcdir)/DESC.proto >$@
diff --git a/font/devcp1047/Makefile.sub b/font/devcp1047/Makefile.sub
index f3551fd..3aca629 100644
--- a/font/devcp1047/Makefile.sub
+++ b/font/devcp1047/Makefile.sub
@@ -10,23 +10,22 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
@rm -f $@
- @(charwidth=`expr $(RES) / $(CPI)` ; \
- sed -e "s/^name [A-Z]*$$/name $@/" \
- -e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
+ @charwidth=`expr $(RES) / $(CPI)` ; \
+ sed -e "s/^name [A-Z]*$$/name $@/" \
+ -e \
+ "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \
-e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
-e "s/^internalname .*$$/internalname $@/" \
-e "/^internalname/s/BI/3/" \
-e "/^internalname/s/B/2/" \
-e "/^internalname/s/I/1/" \
-e "/^internalname .*[^ 0-9]/d" \
- $(srcdir)/R.proto >$@)
+ $(srcdir)/R.proto >$@
DESC: DESC.proto
@echo Making $@
- @-rm -f $@
@sed -e "s/^res .*$$/res $(RES)/" \
- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
- $(srcdir)/DESC.proto >$@
-
+ -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
+ -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
+ -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+ $(srcdir)/DESC.proto >$@
diff --git a/font/devdvi/generate/Makefile b/font/devdvi/generate/Makefile
index 38a182a..5737cfe 100644
--- a/font/devdvi/generate/Makefile
+++ b/font/devdvi/generate/Makefile
@@ -36,7 +36,6 @@ SPECIALFLAG=-s
all: $(FONTS)
-
#### CM fonts ####
# TR is special because it contains \(pl \(eq
@@ -109,7 +108,6 @@ SB: $(srcdir)/msbm.map
$(TFMTODIT) $(SPECIALFLAG) \
$(tfmdir)/msbm10.tfm $(srcdir)/msbm.map $@
-
#### EC fonts ####
TREC: $(srcdir)/ec.map
@@ -150,7 +148,6 @@ HBIEC: $(srcdir)/ec.map
$(TFMTODIT) -g $(gfdir)/ecso1000.300gf \
$(tfmdir)/ecso1000.tfm $(srcdir)/ec.map $@
-
#### TC fonts ####
TRTC: $(srcdir)/tc.map
@@ -193,7 +190,6 @@ HBITC: $(srcdir)/tc.map
$(TFMTODIT) $(SPECIALFLAG) -g $(gfdir)/tcso1000.300gf \
$(tfmdir)/tcso1000.tfm $(srcdir)/tc.map $@
-
clean:
realclean:
diff --git a/font/devhtml/Makefile.sub b/font/devhtml/Makefile.sub
index aedbc6c..fddf312 100644
--- a/font/devhtml/Makefile.sub
+++ b/font/devhtml/Makefile.sub
@@ -11,9 +11,10 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
@rm -f $@
- @(charwidth=`expr $(RES) / $(CPI)` ; \
- sed -e "s/^name [A-Z]*$$/name $@/" \
- -e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
+ @charwidth=`expr $(RES) / $(CPI)` ; \
+ sed -e "s/^name [A-Z]*$$/name $@/" \
+ -e \
+ "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \
-e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
-e "s/^internalname .*$$/internalname $@/" \
-e "/^internalname/s/CR/4/" \
@@ -21,14 +22,13 @@ $(FONTS): R.proto
-e "/^internalname/s/B/2/" \
-e "/^internalname/s/I/1/" \
-e "/^internalname .*[^ 0-9]/d" \
- $(srcdir)/R.proto >$@)
+ $(srcdir)/R.proto >$@
DESC: DESC.proto
@echo Making $@
- @rm -f $@
@sed -e "s/^res .*$$/res $(RES)/" \
- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
- $(srcdir)/DESC.proto >$@
+ -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
+ -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
+ -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+ $(srcdir)/DESC.proto >$@
@echo "image_generator $(GHOSTSCRIPT)" >> $@
diff --git a/font/devlatin1/Makefile.sub b/font/devlatin1/Makefile.sub
index 29414ba..6f6f6ff 100644
--- a/font/devlatin1/Makefile.sub
+++ b/font/devlatin1/Makefile.sub
@@ -10,23 +10,22 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
@rm -f $@
- @(charwidth=`expr $(RES) / $(CPI)` ; \
- sed -e "s/^name [A-Z]*$$/name $@/" \
- -e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
+ @charwidth=`expr $(RES) / $(CPI)` ; \
+ sed -e "s/^name [A-Z]*$$/name $@/" \
+ -e \
+ "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \
-e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
-e "s/^internalname .*$$/internalname $@/" \
-e "/^internalname/s/BI/3/" \
-e "/^internalname/s/B/2/" \
-e "/^internalname/s/I/1/" \
-e "/^internalname .*[^ 0-9]/d" \
- $(srcdir)/R.proto >$@)
+ $(srcdir)/R.proto >$@
DESC: DESC.proto
@echo Making $@
- @-rm -f $@
@sed -e "s/^res .*$$/res $(RES)/" \
- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
- $(srcdir)/DESC.proto >$@
-
+ -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
+ -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
+ -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+ $(srcdir)/DESC.proto >$@
diff --git a/font/devlbp/Makefile.sub b/font/devlbp/Makefile.sub
index 47d71bf..2ef6c87 100644
--- a/font/devlbp/Makefile.sub
+++ b/font/devlbp/Makefile.sub
@@ -10,8 +10,7 @@ DEVFILES=DESC \
MOSTLYCLEANADD=DESC
DESC: DESC.in
- -rm -f DESC
- cat $(srcdir)/DESC.in >>DESC
+ cat $(srcdir)/DESC.in >DESC
if test "$(PAGE)" = A4; then \
echo "papersize a4" >>DESC; \
else \
diff --git a/font/devlj4/Makefile.sub b/font/devlj4/Makefile.sub
index a8cd61b..015e4fd 100644
--- a/font/devlj4/Makefile.sub
+++ b/font/devlj4/Makefile.sub
@@ -25,7 +25,6 @@ DEVFILES=DESC \
MOSTLYCLEANADD=DESC
DESC: DESC.in
- -rm -f DESC
echo "res $(LJ4RES)" >DESC
echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>DESC
cat $(srcdir)/DESC.in >>DESC
diff --git a/font/devlj4/generate/Makefile b/font/devlj4/generate/Makefile
index 8f226f7..84fefe7 100644
--- a/font/devlj4/generate/Makefile
+++ b/font/devlj4/generate/Makefile
@@ -253,7 +253,6 @@ SYMBOL: $(AUTOFONT)/9nb28703.tfm $(SYMBOLMAP)
WINGDINGS: $(AUTOFONT)/9nb00095.tfm $(WINGDINGSMAP)
$(HPFTODIT) $(AUTOFONT)/9nb00095.tfm $(WINGDINGSMAP) $@
-
clean:
realclean:
diff --git a/font/devpdf/Makefile.sub b/font/devpdf/Makefile.sub
index 53973d8..6e88312 100644
--- a/font/devpdf/Makefile.sub
+++ b/font/devpdf/Makefile.sub
@@ -46,11 +46,6 @@ DISTFILES=\
$(DEVFILES) \
$(DEVSCRIPTS)
-
-# Some `makes' don't predefine RM...
-RM=rm -f
-
-
all: DESC
DESC: DESC.in
@@ -78,28 +73,28 @@ DESC: DESC.in
cp -f $(top_srcdir)/font/devps/generate/symbolchars \
$(top_builddir)/font/devpdf/map
-test -d util || $(mkinstalldirs) util
- $(RM) util/BuildFoundries
+ rm -f util/BuildFoundries
if test -n "$(PERL)"; then \
sed -f $(SH_DEPS_SED_SCRIPT) \
- -e "s|/usr/bin/perl|$(PERL)|" \
- -e "s|@GROFF_GHOSTSCRIPT_INTERPRETERS@|$(GHOSTSCRIPT)|" \
- -e "s|@VERSION@|$(version)$(revision)|" \
- -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \
- $(srcdir)/util/BuildFoundries.pl \
- >$(top_builddir)/font/devpdf/util/BuildFoundries ;\
+ -e "s|/usr/bin/perl|$(PERL)|" \
+ -e "s|@GROFF_GHOSTSCRIPT_INTERPRETERS@|$(GHOSTSCRIPT)|" \
+ -e "s|@VERSION@|$(version)$(revision)|" \
+ -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \
+ $(srcdir)/util/BuildFoundries.pl \
+ >$(top_builddir)/font/devpdf/util/BuildFoundries ;\
else \
- sed -f $(SH_DEPS_SED_SCRIPT) \
- -e "s|@VERSION@|$(version)$(revision)|" \
- -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \
- $(srcdir)/util/BuildFoundries.pl \
- >$(top_builddir)/font/devpdf/util/BuildFoundries ;\
+ sed -f $(SH_DEPS_SED_SCRIPT) \
+ -e "s|@VERSION@|$(version)$(revision)|" \
+ -e "s|@GROFF_FONT_DIR@|$(fontdir)|" \
+ $(srcdir)/util/BuildFoundries.pl \
+ >$(top_builddir)/font/devpdf/util/BuildFoundries ;\
fi
chmod +x util/BuildFoundries
echo "# foundry ps name psfile" > $(top_builddir)/font/devpdf/download
-
PATH="$(top_builddir)/src/utils/afmtodit:${GROFF_PATH_SEPARATOR}${PATH}" \
+
PATH="$(top_builddir)/src/utils/afmtodit:$(GROFF_PATH_SEPARATOR)$(PATH)" \
util/BuildFoundries $(top_builddir)/font/devpdf \
'$(top_srcdir)/font/devps : $(top_builddir)/font/devps' \
- >> $(top_builddir)/font/devpdf/download
+ >> $(top_builddir)/font/devpdf/download
install_data:
-test -d $(DESTDIR)$(fontsubdir) \
@@ -111,7 +106,7 @@ install_data:
-test -d $(DESTDIR)$(fontsubdir)/util \
|| $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/util
for f in $(MOSTLYCLEANADD); do \
- $(RM) $(DESTDIR)$(fontsubdir)/$$f; \
+ rm -f $(DESTDIR)$(fontsubdir)/$$f; \
if test -f $$f; then \
$(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \
else \
@@ -121,7 +116,7 @@ install_data:
uninstall_sub:
-for f in $(MOSTLYCLEANADD); do \
- $(RM) $(DESTDIR)$(fontsubdir)/$$f; \
+ rm -f $(DESTDIR)$(fontsubdir)/$$f; \
done
-d="$(DESTDIR)$(fontsubdir)/enc"; \
if test -d "$$d"; then rmdir "$$d"; fi
diff --git a/font/devps/Makefile.sub b/font/devps/Makefile.sub
index 42d92ad..93e1b27 100644
--- a/font/devps/Makefile.sub
+++ b/font/devps/Makefile.sub
@@ -36,7 +36,6 @@ DEVSCRIPTS=$(DEVGENSCRIPTS)
MOSTLYCLEANADD=DESC $(PSFILES)
DESC: DESC.in
- -rm -f DESC
cat $(srcdir)/DESC.in >DESC
echo broken $(BROKEN_SPOOLER_FLAGS) >>DESC
if test "$(PAGE)" = A4; then \
diff --git a/font/devps/generate/Makefile b/font/devps/generate/Makefile
index 4d3ff79..43a0063 100644
--- a/font/devps/generate/Makefile
+++ b/font/devps/generate/Makefile
@@ -255,4 +255,3 @@ extraclean: realclean
rm -f core *~ "#*"
.PHONY: all clean realclean extraclean
-
diff --git a/font/devutf8/Makefile.sub b/font/devutf8/Makefile.sub
index 9150c54..3b00c03 100644
--- a/font/devutf8/Makefile.sub
+++ b/font/devutf8/Makefile.sub
@@ -10,22 +10,22 @@ LPI=6
$(FONTS): R.proto
@echo Making $@
@rm -f $@
- @(charwidth=`expr $(RES) / $(CPI)` ; \
- sed -e "s/^name [A-Z]*$$/name $@/" \
- -e "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth
/" \
+ @charwidth=`expr $(RES) / $(CPI)` ; \
+ sed -e "s/^name [A-Z]*$$/name $@/" \
+ -e \
+ "s/^\\([^ ]*\\) [0-9][0-9]* /\\1 $$charwidth /" \
-e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
-e "s/^internalname .*$$/internalname $@/" \
-e "/^internalname/s/BI/3/" \
-e "/^internalname/s/B/2/" \
-e "/^internalname/s/I/1/" \
-e "/^internalname .*[^ 0-9]/d" \
- $(srcdir)/R.proto >$@)
+ $(srcdir)/R.proto >$@
DESC: DESC.proto
@echo Making $@
- @-rm -f $@
@sed -e "s/^res .*$$/res $(RES)/" \
- -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
- -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
- -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
- $(srcdir)/DESC.proto >$@
+ -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
+ -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
+ -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+ $(srcdir)/DESC.proto >$@
diff --git a/src/devices/gropdf/Makefile.sub b/src/devices/gropdf/Makefile.sub
index 329d4d2..c587dc5 100644
--- a/src/devices/gropdf/Makefile.sub
+++ b/src/devices/gropdf/Makefile.sub
@@ -30,15 +30,11 @@ MOSTLYCLEANADD=\
pdfmom \
$(MAN1)
-# Some `makes' don't predefine RM...
-RM=rm -f
-
-
all: gropdf pdfmom
gropdf: gropdf.pl $(SH_DEPS_SED_SCRIPT)
- $(RM) $@
+ rm -f $@
sed -f $(SH_DEPS_SED_SCRIPT) \
-e "s|@VERSION@|$(version)$(revision)|" \
-e "s|@PERL@|$(PERL)|" \
@@ -47,7 +43,7 @@ gropdf: gropdf.pl $(SH_DEPS_SED_SCRIPT)
chmod +x $@
pdfmom: pdfmom.pl $(SH_DEPS_SED_SCRIPT)
- $(RM) $@
+ rm -f $@
sed -f $(SH_DEPS_SED_SCRIPT) \
-e "s|@VERSION@|$(version)$(revision)|" \
-e "s|@PERL@|$(PERL)|" $(srcdir)/pdfmom.pl >$@
@@ -56,9 +52,9 @@ pdfmom: pdfmom.pl $(SH_DEPS_SED_SCRIPT)
install_data:
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
for f in $(CMDFILES); do \
- $(RM) $(DESTDIR)$(bindir)/$$f; \
+ rm -f $(DESTDIR)$(bindir)/$$f; \
$(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \
done
uninstall_sub:
- -for f in $(CMDFILES); do $(RM) $(DESTDIR)$(bindir)/$$f; done
+ -for f in $(CMDFILES); do rm -f $(DESTDIR)$(bindir)/$$f; done
diff --git a/src/devices/xditview/Makefile.sub
b/src/devices/xditview/Makefile.sub
index dccda2a..edcdf4d 100644
--- a/src/devices/xditview/Makefile.sub
+++ b/src/devices/xditview/Makefile.sub
@@ -33,8 +33,7 @@ all depend: $(GENHDRS)
GXditview-ad.h: $(srcdir)/GXditview.ad
@echo Making $@
- @-rm -f $@
- $(SHELL) $(srcdir)/ad2c $(srcdir)/GXditview.ad >GXditview-ad.h
+ $(SHELL) $(srcdir)/ad2c $(srcdir)/GXditview.ad > $@
install_data: $(srcdir)/GXditview.ad $(srcdir)/GXditview-color.ad
-test -d $(DESTDIR)$(appresdir) \
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index c6c9936..300908a 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -121,8 +121,8 @@ version.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
@echo Making version.cpp
@echo const char \*version_string = \"$(src_version)\"\; >$@
@echo const char \*revision_string = \"$(src_revision)\"\; >>$@
- @echo extern \"C\" const char \*Version_string =
\"$(src_version).$(src_revision)\"\; | \
- sed -e 's/\.0\"/\"/' >>$@
+ @echo extern \"C\" const char \*Version_string =
\"$(src_version).$(src_revision)\"\; \
+ | sed -e 's/\.0\"/\"/' >>$@
# We have to avoid $(COMPILE.c) since we must not use groff's `assert.h'
snprintf.$(OBJEXT): $(srcdir)/../snprintf/snprintf.c
@@ -156,14 +156,14 @@ install_charset_data:
-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; \
+ > $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
$(DESTDIR)$(libdir)/charset.alias; \
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
else \
if test $(GLIBC21) = no; then \
sed -f ref-add.sed charset.alias \
- > $(DESTDIR)$(libdir)/t-charset.alias; \
+ > $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
$(DESTDIR)$(libdir)/charset.alias; \
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
@@ -174,7 +174,7 @@ uninstall_sub: uninstall_charset_data
uninstall_charset_data:
-if test -f $(DESTDIR)$(libdir)/charset.alias; then \
sed -f ref-del.sed $(DESTDIR)$(libdir)/charset.alias \
- > $(DESTDIR)$(libdir)/t-charset.alias; \
+ > $(DESTDIR)$(libdir)/t-charset.alias; \
if grep '^# Packages using this file: $$' \
$(DESTDIR)$(libdir)/t-charset.alias > /dev/null; then \
rm -f $(DESTDIR)$(libdir)/charset.alias; \
diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub
index f710700..87b97db 100644
--- a/src/preproc/eqn/Makefile.sub
+++ b/src/preproc/eqn/Makefile.sub
@@ -48,8 +48,8 @@ all: neqn
neqn: neqn.sh $(SH_DEPS_SED_SCRIPT)
rm -f $@
sed -e 's/@g@/$(g)/g' \
- -f $(SH_DEPS_SED_SCRIPT) \
- -e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >$@
+ -f $(SH_DEPS_SED_SCRIPT) \
+ -e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >$@
chmod +x $@
install_data: neqn
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index 7fd23c9..4119201 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -39,49 +39,37 @@ GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \
MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT)
-RM=rm -f
-
all: $(srcdir)/groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT)
groff_opts.tmp: $(srcdir)/groff.cpp
- @$(GREP) -e ':.*:.*:' $? \
- | sed -e 's/[ \t",]//g' > $@
+ @$(GREP) -e ':.*:.*:' $? | sed -e 's/[ \t",]//g' > $@
@echo -n 'groff options: '
@cat $@
groff_opts_no_arg.txt: groff_opts.tmp
- @$(RM) $@
@sed -e 's/[a-zA-Z]://g' $? > $@
@echo -n 'no arg: '
@cat $@
groff_opts_with_arg.txt: groff_opts_no_arg.txt
- @$(RM) $@
+ @rm -f $@
@sed "s/[`cat $?`:]//g" groff_opts.tmp > $@
@echo -n 'with arg: '
@cat $@
install_data: $(GROFF_OPTS_OUTPUT)
-test -d $(DESTDIR)$(libprogramdir) \
- || $(mkinstalldirs) $(DESTDIR)$(libprogramdir)
+ || $(mkinstalldirs) $(DESTDIR)$(libprogramdir)
for f in $(GROFF_OPTS_OUTPUT); do \
- $(RM) $(DESTDIR)$(libprogramdir)/$$f; \
- $(INSTALL_SCRIPT) $$f $(DESTDIR)$(libprogramdir); \
+ rm -f $(DESTDIR)$(libprogramdir)/$$f; \
+ $(INSTALL_SCRIPT) $$f $(DESTDIR)$(libprogramdir); \
done
uninstall_sub:
-for f in $(GROFF_OPTS_OUTPUT); do \
- $(RM) $(DESTDIR)$(libprogramdir)/$$f;\
+ rm -f $(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)
# -d="$(DESTDIR)$(libprogramdir)";\
# if test -d "$$d"; then rmdir "$$d"; fi
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index a0d4893..5a2accc 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -27,9 +27,6 @@
MAN1=grog.n
MOSTLYCLEANADD=grog $(MAN1)
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
all: grog $(MAN1)
# lib .pl-files
@@ -41,40 +38,38 @@ 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 -f $@
sed -f "$(SH_DEPS_SED_SCRIPT)" \
- -e "1s|^\(#! \).*perl|\\1$(PERL)|" \
- -e "s|@g@|$(g)|g" \
- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
- -e "s|@EGREP@|$(EGREP)|g" \
- -e "s|@VERSION@|$(version)$(revision)|" \
- -e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/grog.pl >$@;
+ -e "1s|^\(#! \).*perl|\\1$(PERL)|" \
+ -e "s|@g@|$(g)|g" \
+ -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
+ -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
+ -e "s|@EGREP@|$(EGREP)|g" \
+ -e "s|@VERSION@|$(version)$(revision)|" \
+ -e "$(SH_SCRIPT_SED_CMD)" \
+ $(srcdir)/grog.pl >$@;
chmod +x $@;
.PHONY: install_data
install_data: grog
- -test -d "$(DESTDIR)$(bindir)" || \
- $(mkinstalldirs) "$(DESTDIR)$(bindir)";
- $(RM) $(DESTDIR)$(bindir)/grog
- $(INSTALL_SCRIPT) grog "$(DESTDIR)$(bindir)/grog";
- -test -d $(DESTDIR)$(grog_dir) || \
- $(mkinstalldirs) "$(DESTDIR)$(grog_dir)";
+ -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+ rm -f $(DESTDIR)$(bindir)/grog
+ $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
+ -test -d $(DESTDIR)$(grog_dir) || $(mkinstalldirs) $(DESTDIR)$(grog_dir)
for f in $(GROG_); do \
- $(RM) "$(DESTDIR)$(grog_dir)/$$f"; \
- $(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(grog_dir)/$$f"; \
+ rm -f "$(DESTDIR)$(grog_dir)/$$f"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \
done;
.PHONY: uninstall_data
uninstall_sub:
rm -f "$(DESTDIR)$(bindir)/grog"
-for f in $(GROG_); do \
- $(RM) "$(DESTDIR)$(grog_dir)/$$f"; \
+ rm -f "$(DESTDIR)$(grog_dir)/$$f"; \
done
-d="$(DESTDIR)$(grog_dir)";\
- if test -d "$$d"; then rmdir "$$d"; fi
+ if test -d "$$d"; then rmdir $$d; fi
########################################################################
# Emacs settings
diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub
index b59e777..5b06b09 100644
--- a/src/roff/nroff/Makefile.sub
+++ b/src/roff/nroff/Makefile.sub
@@ -7,8 +7,8 @@ all: nroff
nroff: nroff.sh $(SH_DEPS_SED_SCRIPT)
rm -f $@
sed -f $(SH_DEPS_SED_SCRIPT) \
- -e $(SH_SCRIPT_SED_CMD) \
- -e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/nroff.sh >$@
+ -e $(SH_SCRIPT_SED_CMD) \
+ -e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/nroff.sh >$@
chmod +x $@
install_data: nroff
diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
index 4bc2ae0..3db9608 100644
--- a/src/roff/troff/Makefile.sub
+++ b/src/roff/troff/Makefile.sub
@@ -42,7 +42,8 @@ majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
@echo Making $@
@rm -f $@
@echo const char \*major_version = \
- \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@
+ \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@
@echo const char \*minor_version = \
- \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; >>$@
+ \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; \
+ >>$@
@echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@
diff --git a/src/utils/afmtodit/Makefile.sub b/src/utils/afmtodit/Makefile.sub
index 141a7bc..ce0a3d8 100644
--- a/src/utils/afmtodit/Makefile.sub
+++ b/src/utils/afmtodit/Makefile.sub
@@ -26,17 +26,17 @@ all: afmtodit
afmtodit: afmtodit.pl afmtodit.tables
if test -n "$(PERL)"; then \
sed -e "s|/usr/bin/perl|$(PERL)|" \
- -e "s|@VERSION@|$(version)$(revision)|" \
- -e "s|@FONTDIR@|$(fontdir)|" \
- -e "/@afmtodit.tables@/ r $(srcdir)/afmtodit.tables" \
- -e "/@afmtodit.tables@/ d" \
- $(srcdir)/afmtodit.pl >afmtodit; \
+ -e "s|@VERSION@|$(version)$(revision)|" \
+ -e "s|@FONTDIR@|$(fontdir)|" \
+ -e "/@afmtodit.tables@/ r $(srcdir)/afmtodit.tables" \
+ -e "/@afmtodit.tables@/ d" \
+ $(srcdir)/afmtodit.pl >afmtodit; \
else \
sed -e "s|@VERSION@|$(version)$(revision)|" \
- -e "s|@FONTDIR@|$(fontdir)|" \
- -e "/@afmtodit.tables@/ r $(srcdir)/afmtodit.tables" \
- -e "/@afmtodit.tables@/ d" \
- $(srcdir)/afmtodit.pl >afmtodit; \
+ -e "s|@FONTDIR@|$(fontdir)|" \
+ -e "/@afmtodit.tables@/ r $(srcdir)/afmtodit.tables" \
+ -e "/@afmtodit.tables@/ d" \
+ $(srcdir)/afmtodit.pl >afmtodit; \
fi
chmod +x afmtodit
diff --git a/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub
index d500679..cd11e8c 100644
--- a/src/utils/indxbib/Makefile.sub
+++ b/src/utils/indxbib/Makefile.sub
@@ -21,8 +21,8 @@ install_data: $(srcdir)/eign
if test -f /usr/lib/eign; then \
rm -f $(DESTDIR)$(common_words_file); \
ln -s /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
- || ln /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
- || cp /usr/lib/eign $(DESTDIR)$(common_words_file); \
+ || ln /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
+ || cp /usr/lib/eign $(DESTDIR)$(common_words_file); \
else \
rm -f $(DESTDIR)$(common_words_file); \
$(INSTALL_DATA) $(srcdir)/eign $(DESTDIR)$(common_words_file); \
diff --git a/src/utils/xtotroff/Makefile.in b/src/utils/xtotroff/Makefile.in
index dcfa470..4205190 100644
--- a/src/utils/xtotroff/Makefile.in
+++ b/src/utils/xtotroff/Makefile.in
@@ -36,8 +36,8 @@ fonts: $(xtotroff) $(driverdir)/DESC.in $(driverdir)/FontMap
fonts=`sed -e 's/[ ].*//' $(driverdir)/FontMap`; \
for dpi in $(DPIS); do \
echo Making devX$$dpi; \
- test -d $(devdir)/devX$$dpi || \
- $(mkinstalldirs) $(devdir)/devX$$dpi; \
+ test -d $(devdir)/devX$$dpi \
+ || $(mkinstalldirs) $(devdir)/devX$$dpi; \
rm -f $(devdir)/devX$$dpi/DESC; \
sed -e "s/res 75/res $$dpi/" $(driverdir)/DESC.in \
>$(devdir)/devX$$dpi/DESC; \
@@ -47,8 +47,8 @@ fonts: $(xtotroff) $(driverdir)/DESC.in $(driverdir)/FontMap
echo DEVFILES=DESC $$fonts >>Makefile.sub; \
$(xtotroff) -r $$dpi -s 10 $(driverdir)/FontMap); \
echo Making devX$$dpi-12; \
- test -d $(devdir)/devX$$dpi-12 || \
- $(mkinstalldirs) $(devdir)/devX$$dpi-12; \
+ test -d $(devdir)/devX$$dpi-12 \
+ || $(mkinstalldirs) $(devdir)/devX$$dpi-12; \
rm -f $(devdir)/devX$$dpi-12/DESC; \
sed -e "s/res 75/res $$dpi/" \
-e 's/unitwidth 10/unitwidth 12/' $(driverdir)/DESC.in \
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 4031767..5aa11e8 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -114,11 +114,11 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
rm -f $(DESTDIR)$(mdocdir)/$$f; \
$(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
done
- -test -f $(DESTDIR)$(localtmacdir)/man.local || \
- $(INSTALL_DATA) $(srcdir)/man.local \
- $(DESTDIR)$(localtmacdir)/man.local
- -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \
- $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
+ -test -f $(DESTDIR)$(localtmacdir)/man.local \
+ || $(INSTALL_DATA) $(srcdir)/man.local \
+ $(DESTDIR)$(localtmacdir)/man.local
+ -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
+ || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \
@@ -141,9 +141,8 @@ stamp-wrap:
touch $@
stamp-sed: www.tmac
- rm -f www.tmac-sed; \
sed -e "s;@PNMTOPS_NOSETPAGE@;$(pnmtops_nosetpage);g" \
- $(srcdir)/www.tmac > www.tmac-sed;
+ $(srcdir)/www.tmac > www.tmac-sed
touch $@
uninstall_sub:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 08/09: */Makefile.*: Put straight error-prevention prefixes for `rm', part 2.,
Werner LEMBERG <=