[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 05/05: * */Makefile.*: Path quoting fixes, whitespace, formattin
|
From: |
Werner LEMBERG |
|
Subject: |
[groff] 05/05: * */Makefile.*: Path quoting fixes, whitespace, formatting. |
|
Date: |
Thu, 03 Apr 2014 05:59:30 +0000 |
wl pushed a commit to branch master
in repository groff.
commit 1b8b2a7b019846b6340611e5c562f5b6b3f5ba74
Author: Steffen Nurpmeso <address@hidden>
Date: Thu Apr 3 07:58:48 2014 +0200
* */Makefile.*: Path quoting fixes, whitespace, formatting.
Remove many quotes (and introduce a few as additional guards) since
groff's build system is generally not set up to properly handle
paths that need quoting.
---
ChangeLog | 8 ++++++++
Makefile.ccpg | 10 +++++-----
Makefile.comm | 38 +++++++++++++++++---------------------
Makefile.cpg | 10 +++++-----
Makefile.dev | 10 +++++-----
Makefile.in | 19 +++++++++----------
Makefile.init | 10 +++++-----
Makefile.lib | 10 +++++-----
Makefile.man | 10 +++++-----
Makefile.sub | 10 +++++-----
arch/misc/Makefile.sub | 10 +++++-----
contrib/eqn2graph/Makefile.sub | 8 ++++----
contrib/glilypond/Makefile.sub | 7 ++++---
contrib/grap2graph/Makefile.sub | 8 ++++----
contrib/groffer/Makefile.sub | 2 +-
contrib/hdtbl/Makefile.sub | 14 ++++++++------
contrib/mm/Makefile.sim | 12 ++++++------
contrib/mm/Makefile.sub | 12 ++++++------
contrib/mom/Makefile.sub | 11 +++++++----
contrib/pdfmark/Makefile.sub | 16 +++++++++-------
contrib/pic2graph/Makefile.sub | 8 ++++----
doc/Makefile.in | 14 +++++++-------
doc/Makefile.sub | 10 +++++-----
font/devpdf/Makefile.sub | 18 +++++++++---------
src/libs/libgroff/Makefile.sub | 6 +++---
src/roff/groff/Makefile.sub | 9 +++++----
src/roff/grog/Makefile.sub | 27 +++++++++------------------
tmac/Makefile.sub | 8 ++++----
28 files changed, 169 insertions(+), 166 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f8fb923..a913d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2014-04-03 Steffen Nurpmeso <address@hidden>
+ * */Makefile.*: Path quoting fixes, whitespace, formatting.
+
+ Remove many quotes (and introduce a few as additional guards) since
+ groff's build system is generally not set up to properly handle
+ paths that need quoting.
+
+2014-04-03 Steffen Nurpmeso <address@hidden>
+
* Makefile.comm (extraclean): Don't delete `old'.
The rule calling `rm -f' was originally thought to remove private,
diff --git a/Makefile.ccpg b/Makefile.ccpg
index b6a3cde..ee2533a 100644
--- a/Makefile.ccpg
+++ b/Makefile.ccpg
@@ -1,19 +1,19 @@
-# Copyright (C) 1992, 1995, 2001, 2004, 2009
+# Copyright (C) 1992, 1995, 2001, 2004, 2009, 2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/Makefile.comm b/Makefile.comm
index 6bcb2e8..89bbc25 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -1,19 +1,19 @@
-# Copyright (C) 1989-2000, 2002-2004, 2006-2011, 2013, 2014
+# Copyright (C) 1989-2000, 2002-2004, 2006-2011, 2013-2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
@@ -69,9 +69,7 @@ fonts:
mostlyclean:
rm -f $(MOSTLYCLEANFILES)
-rm -rf $(MOSTLYCLEANDIRADD)
- address@hidden test `cd $(srcdir); pwd` = `pwd`; then \
- :; \
- else \
+ address@hidden test "`cd $(srcdir); pwd`" != "`pwd`"; then \
rm -f $(MOSTLYCLEANNOTSRCDIRADD); \
fi
@@ -80,9 +78,7 @@ clean: mostlyclean
distclean: clean
rm -f $(DISTCLEANFILES)
- address@hidden test `cd $(srcdir); pwd` = `pwd`; then \
- :; \
- else \
+ address@hidden test "`cd $(srcdir); pwd`" != "`pwd`"; then \
rm -f $(YTABC) $(YTABH); \
fi
@@ -301,17 +297,17 @@ uninstall_dev:
|| for f in ""$(OLDDEVFILES); do \
rm -f $(DESTDIR)$(oldfontsubdir)/$$f; \
done
- -d="$(DESTDIR)$(fontsubdir)/generate";\
- if test -d "$$d"; then rmdir "$$d"; fi
- -d="$(DESTDIR)$(fontsubdir)/enc";\
- if test -d "$$d"; then rmdir "$$d"; fi
- -d="$(DESTDIR)$(fontsubdir)/map";\
- if test -d "$$d"; then rmdir "$$d"; fi
- -d="$(DESTDIR)$(fontsubdir)/util";\
- if test -d "$$d"; then rmdir "$$d"; fi
+ -d=$(DESTDIR)$(fontsubdir)/generate;\
+ if test -d $$d; then rmdir $$d; fi
+ -d=$(DESTDIR)$(fontsubdir)/enc;\
+ if test -d $$d; then rmdir $$d; fi
+ -d=$(DESTDIR)$(fontsubdir)/map;\
+ if test -d $$d; then rmdir $$d; fi
+ -d=$(DESTDIR)$(fontsubdir)/util;\
+ if test -d $$d; then rmdir $$d; fi
-rmdir $(DESTDIR)$(fontsubdir)
- -d="$(DESTDIR)$(oldfontsubdir)";\
- if test -d "$$d"; then rmdir "$$d"; fi
+ -d=$(DESTDIR)$(oldfontsubdir);\
+ if test -d $$d; then rmdir $$d; fi
.PHONY: depend_src
depend_src: depend.temp
diff --git a/Makefile.cpg b/Makefile.cpg
index bcb020f..d5894b5 100644
--- a/Makefile.cpg
+++ b/Makefile.cpg
@@ -1,19 +1,19 @@
-# Copyright (C) 1992, 1995, 2001, 2004, 2009
+# Copyright (C) 1992, 1995, 2001, 2004, 2009, 2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/Makefile.dev b/Makefile.dev
index 864c7bf..4d2fc8b 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -1,18 +1,18 @@
-# Copyright (C) 1989-2000, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2003, 2009, 2014 Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/Makefile.in b/Makefile.in
index 7e6d851..65ae1fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,19 +3,19 @@
# Written by James Clark (address@hidden)
#
# Last update: 30 Mar 2014
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
@@ -384,7 +384,7 @@ address@hidden@
# <stdio.h>
# -DICONV_CONST=const if declaration of iconv() needs const
# -DLONG_FOR_TIME_T if localtime() takes a long * not a time_t *
-# -DRETSIGTYPE=int if signal handlers return int not void
+# -DRETSIGTYPE=int if signal handlers return int not void
# -DRET_TYPE_SRAND_IS_VOID if srand() returns void not int
#
# -DWCOREFLAG=0200 if the 0200 bit of the status returned by
@@ -617,7 +617,6 @@ MAKE_K_FLAG=`for f in x $(MAKEFLAGS); do \
esac; \
done`
-
INCDIRS=\
src/include
LIBDIRS=\
@@ -907,8 +906,8 @@ dist:
rm -f tmp/Makefile
cp Makefile.init tmp/Makefile
mv tmp groff-$(version)$(revision)
- tar cfh - groff-$(version)$(revision) | \
- gzip -c >groff-$(version)$(revision).tar.gz
+ tar cfh - groff-$(version)$(revision) \
+ | gzip -c >groff-$(version)$(revision).tar.gz
rm -fr groff-$(version)$(revision)
# $(PROGDIRS): libgroff
@@ -939,8 +938,8 @@ install:
@$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) \
do=do_install $(dodirs)
cd $(DESTDIR)$(dataprogramdir); \
- rm -f current; \
- $(LN_S) $(version)$(revision) current
+ rm -f current; \
+ $(LN_S) $(version)$(revision) current
.PHONY: uninstall
uninstall: uninstall_sub uninstall_dirs
diff --git a/Makefile.init b/Makefile.init
index 832ec0c..bc141ca 100644
--- a/Makefile.init
+++ b/Makefile.init
@@ -1,18 +1,18 @@
-# Copyright (C) 1989-2000, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2009, 2014 Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/Makefile.lib b/Makefile.lib
index 746360e..b1b9a47 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -1,18 +1,18 @@
-# Copyright (C) 1989-2000, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2003, 2009, 2014 Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/Makefile.man b/Makefile.man
index 2f41967..21b1679 100644
--- a/Makefile.man
+++ b/Makefile.man
@@ -1,19 +1,19 @@
-# Copyright (C) 1992, 2001, 2009
+# Copyright (C) 1992, 2001, 2009, 2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/Makefile.sub b/Makefile.sub
index f810de0..0094a59 100644
--- a/Makefile.sub
+++ b/Makefile.sub
@@ -1,19 +1,19 @@
-# Copyright (C) 1989-2000, 2001-2004, 2006, 2009, 2013
+# Copyright (C) 1989-2000, 2001-2004, 2006, 2009, 2013-2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/arch/misc/Makefile.sub b/arch/misc/Makefile.sub
index 5bce8ce..f5d6b51 100644
--- a/arch/misc/Makefile.sub
+++ b/arch/misc/Makefile.sub
@@ -1,18 +1,18 @@
-# Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2009, 2014 Free Software Foundation, Inc.
# Written by Keith Marshall (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub
index 02567e6..ff5e3ae 100644
--- a/contrib/eqn2graph/Makefile.sub
+++ b/contrib/eqn2graph/Makefile.sub
@@ -1,18 +1,18 @@
# Copyright (C) 2002, 2006, 2009, 2014
# Free Software Foundation, Inc.
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub
index 9bd3eae..7dc5961 100644
--- a/contrib/glilypond/Makefile.sub
+++ b/contrib/glilypond/Makefile.sub
@@ -34,9 +34,10 @@ all: glilypond
# files going to lib directory `$(glilypond_dir)'
-GLILYPOND_LIB=$(srcdir)/subs.pl \
- $(srcdir)/oop_fh.pl \
- $(srcdir)/args.pl
+GLILYPOND_LIB=\
+ $(srcdir)/subs.pl \
+ $(srcdir)/oop_fh.pl \
+ $(srcdir)/args.pl
GLILYPOND_LIB_=`echo $(GLILYPOND_LIB) | sed 's|$(srcdir)/||g'`
diff --git a/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub
index bd08345..9647eeb 100644
--- a/contrib/grap2graph/Makefile.sub
+++ b/contrib/grap2graph/Makefile.sub
@@ -1,18 +1,18 @@
# Copyright (C) 2003, 2006, 2009, 2014
# Free Software Foundation, Inc.
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index d98b4d3..f1fd51d 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -74,7 +74,7 @@ groffer: $(GROFFER_PERL) \
chmod +x $@
for m in $(ROFF2MODES); do \
cat $(srcdir)/roff2.man \
- | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \
+ | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \
done
install_data: groffer
diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub
index c85efb9..b028457 100644
--- a/contrib/hdtbl/Makefile.sub
+++ b/contrib/hdtbl/Makefile.sub
@@ -1,18 +1,18 @@
# Copyright (C) 2006, 2009, 2010, 2012, 2014 Free Software Foundation, Inc.
# Written by Werner Lemberg (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -109,8 +109,8 @@ gnu.eps:
elif test -f $(top_builddir)/doc/gnu.eps; then \
cp $(top_builddir)/doc/gnu.eps . ; \
else \
- xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 | \
- $(pnmtops_nosetpage) -noturn -rle >$@ ; \
+ xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \
+ | $(pnmtops_nosetpage) -noturn -rle >$@ ; \
fi
examples/stamp:
@@ -125,6 +125,7 @@ stamp-strip: $(STRIPFILES)
touch $@
install_data: install_always $(make_install_examples)
+
install_always: $(STRIPFILES) $(GENFILES)
-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
for f in $(STRIPFILES); do \
@@ -148,6 +149,7 @@ install_examples: install_always $(EXAMPLEFILES)
$(PROCESSEDEXAMPLEFILES) \
$(INSTALL_DATA) gnu.eps $(DESTDIR)$(exampledir)/hdtbl/gnu.eps
uninstall_sub: uninstall_always $(make_uninstall_examples)
+
uninstall_always:
-for f in $(STRIPFILES); do rm -f $(DESTDIR)$(tmacdir)/$$f; done
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index c132a8d..09da95b 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,17 +1,17 @@
# Copyright 1991, 1993, 2000, 2001, 2009, 2014
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
@@ -46,11 +46,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
+ INSTALL_DATA='$(install)' tmac_m=$(tmac_m) install
uninstall: groff_mm.n groff_mmse.n
$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
- INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub
+ INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub
.man.n:
@echo Making $@ from $<
diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
index aab1080..faf577f 100644
--- a/contrib/mm/Makefile.sub
+++ b/contrib/mm/Makefile.sub
@@ -1,20 +1,20 @@
-# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011, 2013, 2014
+# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011, 2013-2014
# Free Software Foundation, Inc.
-#
+#
# Last update: 15 Apr 2013
#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
@@ -27,7 +27,7 @@ MAN1=\
MAN7=\
groff_mm.n \
groff_mmse.n
-FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov
+FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov
# Local configuration files with default values.
LOCALE=locale se_locale
MOSTLYCLEANADD=temp
diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
index c213d8f..a286dfb 100644
--- a/contrib/mom/Makefile.sub
+++ b/contrib/mom/Makefile.sub
@@ -1,19 +1,19 @@
# Copyright (C) 2002-2006, 2009, 2012-2014
# Free Software Foundation, Inc.
# Written by Werner Lemberg (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -134,6 +134,7 @@ examples/stamp:
install_data: install_always \
$(make_install_pdfdoc) $(make_install_htmldoc) \
$(make_install_examples)
+
install_always: stamp-strip $(NORMALFILES)
-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
for f in $(NORMALFILES); do \
@@ -158,6 +159,7 @@ install_htmldoc: install_always $(HTMLDOCFILES)
done
install_examples: install_examples_always $(make_install_pdfexamples)
+
install_examples_always: $(EXAMPLEFILES)
-test -d $(DESTDIR)$(exampledir)/mom \
|| $(mkinstalldirs) $(DESTDIR)$(exampledir)/mom
@@ -189,6 +191,7 @@ stamp-strip: $(STRIPFILES)
uninstall_sub: uninstall_always \
$(make_uninstall_pdfdoc) $(make_uninstall_htmldoc) \
$(make_uninstall_examples)
+
uninstall_always:
-for f in $(NORMALFILES) $(STRIPFILES); do \
rm -f $(DESTDIR)$(tmacdir)/$$f; \
diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub
index ffa402a..4332367 100644
--- a/contrib/pdfmark/Makefile.sub
+++ b/contrib/pdfmark/Makefile.sub
@@ -1,19 +1,19 @@
-# Copyright (C) 2005, 2006, 2009, 2011, 2012, 2014
+# Copyright (C) 2005, 2006, 2009, 2011, 2012-2014
# Free Software Foundation, Inc.
# Written by Keith Marshall (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -74,8 +74,8 @@ gnu.eps:
elif test -f $(top_builddir)/doc/gnu.eps; then \
cp $(top_builddir)/doc/gnu.eps . ; \
else \
- xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 | \
- $(pnmtops_nosetpage) -noturn -rle >$@ ; \
+ xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \
+ | $(pnmtops_nosetpage) -noturn -rle >$@ ; \
fi
pdfroff: pdfroff.sh $(SH_DEPS_SED_SCRIPT)
@@ -87,6 +87,7 @@ pdfroff: pdfroff.sh $(SH_DEPS_SED_SCRIPT)
chmod +x $@
install_data: install_always $(make_install_pdfdoc)
+
install_always:
-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
for f in $(CMDFILES); do \
@@ -108,6 +109,7 @@ install_pdfdoc: install_always
done
uninstall_sub: uninstall_always $(make_uninstall_pdfdoc)
+
uninstall_always:
-for f in $(CMDFILES); do rm -f $(DESTDIR)$(bindir)/$$f; done
-for f in $(TMACFILES); do rm -f $(DESTDIR)$(tmacdir)/$$f; done
diff --git a/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub
index 94b9f05..4a98487 100644
--- a/contrib/pic2graph/Makefile.sub
+++ b/contrib/pic2graph/Makefile.sub
@@ -1,18 +1,18 @@
# Copyright (C) 2001, 2006, 2009, 2014
# Free Software Foundation, Inc.
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 54487d8..4fafaf0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,19 +1,19 @@
# Copyright (C) 2002-2007, 2009-2011, 2014
# Free Software Foundation, Inc.
# Written by Werner Lemberg <address@hidden>
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -76,9 +76,9 @@ TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac
TROFF=$(TROFFBIN) $(TFLAG) $(FFLAG) -ww
GROFF=\
sed -e "s;@VERSION@;$(version)$(revision);" $< \
- | GROFF_COMMAND_PREFIX= \
- GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
- $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww
+ | GROFF_COMMAND_PREFIX= \
+ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
+ $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww
imagedir=img
diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index 9eaa187..0778d5f 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -1,19 +1,19 @@
-# Copyright (C) 2002-2007, 2009, 2011, 2013, 2014
+# Copyright (C) 2002-2007, 2009, 2011, 2013-2014
# Free Software Foundation, Inc.
# Written by Werner Lemberg <address@hidden>
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/font/devpdf/Makefile.sub b/font/devpdf/Makefile.sub
index 6e88312..baae606 100644
--- a/font/devpdf/Makefile.sub
+++ b/font/devpdf/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2011, 2013, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2013-2014 Free Software Foundation, Inc.
# Free Software Foundation, Inc.
# Written by Deri James <address@hidden>
#
@@ -118,11 +118,11 @@ uninstall_sub:
-for f in $(MOSTLYCLEANADD); do \
rm -f $(DESTDIR)$(fontsubdir)/$$f; \
done
- -d="$(DESTDIR)$(fontsubdir)/enc"; \
- if test -d "$$d"; then rmdir "$$d"; fi
- -d="$(DESTDIR)$(fontsubdir)/map"; \
- if test -d "$$d"; then rmdir "$$d"; fi
- -d="$(DESTDIR)$(fontsubdir)/util"; \
- if test -d "$$d"; then rmdir "$$d"; fi
- -d="$(DESTDIR)$(fontsubdir)"; \
- if test -d "$$d"; then rmdir "$$d"; fi
+ -d=$(DESTDIR)$(fontsubdir)/enc; \
+ if test -d $$d; then rmdir $$d; fi
+ -d=$(DESTDIR)$(fontsubdir)/map; \
+ if test -d $$d; then rmdir $$d; fi
+ -d=$(DESTDIR)$(fontsubdir)/util; \
+ if test -d $$d; then rmdir $$d; fi
+ -d=$(DESTDIR)$(fontsubdir); \
+ if test -d $$d; then rmdir $$d; fi
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index 300908a..80fd87c 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -158,14 +158,14 @@ install_charset_data:
sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias \
> $(DESTDIR)$(libdir)/t-charset.alias; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
- $(DESTDIR)$(libdir)/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; \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
- $(DESTDIR)$(libdir)/charset.alias; \
+ $(DESTDIR)$(libdir)/charset.alias; \
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
fi; \
fi
@@ -180,7 +180,7 @@ uninstall_charset_data:
rm -f $(DESTDIR)$(libdir)/charset.alias; \
else \
$(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
- $(DESTDIR)$(libdir)/charset.alias; \
+ $(DESTDIR)$(libdir)/charset.alias; \
fi; \
rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
fi
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index 4119201..d1d3381 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -34,8 +34,9 @@ CCSRCS=$(srcdir)/groff.cpp
CSRCS=$(srcdir)/pipeline.c
HDRS=$(srcdir)/pipeline.h
-GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \
- groff_opts_with_arg.txt
+GROFF_OPTS_OUTPUT=\
+ groff_opts_no_arg.txt \
+ groff_opts_with_arg.txt
MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT)
@@ -71,5 +72,5 @@ uninstall_sub:
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
+# -d=$(DESTDIR)$(libprogramdir);\
+# if test -d $$d; then rmdir $$d; fi
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index 5a2accc..318656d 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -2,7 +2,7 @@
# File position: <groff-source>/src/roff/grog/Makefile.sub
-# Copyright (C) 1993, 2006, 2009, 2013, 2014
+# Copyright (C) 1993, 2006, 2009, 2013-2014
# Free Software Foundation, Inc.
# Last update: 30 Mar 2014
@@ -47,9 +47,8 @@ grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
-e "s|@EGREP@|$(EGREP)|g" \
-e "s|@VERSION@|$(version)$(revision)|" \
-e "$(SH_SCRIPT_SED_CMD)" \
- $(srcdir)/grog.pl >$@;
- chmod +x $@;
-
+ $(srcdir)/grog.pl >$@
+ chmod +x $@
.PHONY: install_data
install_data: grog
@@ -58,23 +57,15 @@ install_data: grog
$(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
-test -d $(DESTDIR)$(grog_dir) || $(mkinstalldirs) $(DESTDIR)$(grog_dir)
for f in $(GROG_); do \
- rm -f "$(DESTDIR)$(grog_dir)/$$f"; \
+ rm -f $(DESTDIR)$(grog_dir)/$$f; \
$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \
- done;
+ done
.PHONY: uninstall_data
uninstall_sub:
- rm -f "$(DESTDIR)$(bindir)/grog"
+ rm -f $(DESTDIR)$(bindir)/grog
-for f in $(GROG_); do \
- rm -f "$(DESTDIR)$(grog_dir)/$$f"; \
+ rm -f $(DESTDIR)$(grog_dir)/$$f; \
done
- -d="$(DESTDIR)$(grog_dir)";\
- if test -d "$$d"; then rmdir $$d; fi
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
+ -d=$(DESTDIR)$(grog_dir);\
+ if test -d $$d; then rmdir $$d; fi
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 5aa11e8..19877eb 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -1,19 +1,19 @@
# Copyright (C) 1989-2007, 2009-2012, 2014
# Free Software Foundation, Inc.
# Written by James Clark (address@hidden)
-#
+#
# This file is part of groff.
-#
+#
# groff is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
+#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 05/05: * */Makefile.*: Path quoting fixes, whitespace, formatting.,
Werner LEMBERG <=