[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/22] maint: simplify definition of $MAN in configure.ac
From: |
Stefano Lattarini |
Subject: |
[PATCH 08/22] maint: simplify definition of $MAN in configure.ac |
Date: |
Wed, 29 Aug 2012 23:54:45 +0200 |
* configure.ac: Here, by making less use of 'sed' and 'tr' munging,
and relying on a smarter and simpler shell loop instead.
Signed-off-by: Stefano Lattarini <address@hidden>
---
configure.ac | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index 52918ca..bc7520d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,16 +456,19 @@ case " $optional_bin_progs " in
*' stdbuf '*) gl_ADD_PROG([optional_pkglib_progs], [libstdbuf.so]) ;;
esac
-MAN=`echo "$optional_bin_progs "|sed 's/ /.1 /g;s/ $//'|tr -d '\\015\\012'`
-
-# Change "ginstall.1" to "install.1" in $MAN.
-MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done \
- | tr '\015\012' ' '; echo`
-
-# Remove [.1, since writing a portable rule for it in man/Makefile.am
-# is not practical. The sed LHS below uses the autoconf quadrigraph
-# representing '['.
-MAN=`echo "$MAN"|sed 's/\@<:@\.1//'`
+MAN=`
+ for p in $optional_bin_progs; do
+ # Change "ginstall.1" to "install.1" in $MAN.
+ test $p = ginstall && p=install
+ # Ignore the "[" program, since writing a portable make rule to
+ # generate its manpage is not practical.
+ dnl Use the autoconf-provided quadrigraph to represent "[",
+ dnl otherwise we will incur in dreadful quoting issues.
+ test x$p = x'@<:@' && continue
+ echo "$p.1"
+ done`
+# Normalize whitespace.
+MAN=`echo $MAN`
OPTIONAL_BIN_PROGS=`echo "$optional_bin_progs "|sed 's/ /\$(EXEEXT) /g;s/ $//'`
AC_SUBST([OPTIONAL_BIN_PROGS])
--
1.7.12
- [PATCH 00/22] Towards a non-recursive build system for coreutils?, Stefano Lattarini, 2012/08/29
- [PATCH 02/22] maint: slightly improve .gitignore, Stefano Lattarini, 2012/08/29
- [PATCH 01/22] build: don't abuse Automake internals (with its 'check-am' rule), Stefano Lattarini, 2012/08/29
- [PATCH 03/22] build: add extra *.texi files to coreutils_TEXINFOS, not EXTRA_DIST, Stefano Lattarini, 2012/08/29
- [PATCH 04/22] build: prefer '$(top_srcdir)/doc' over '$(srcdir)' in doc Makefile, Stefano Lattarini, 2012/08/29
- [PATCH 05/22] build: use 'check-local' to extend the 'check' target, Stefano Lattarini, 2012/08/29
- [PATCH 06/22] build: don't use recursive make to build the 'doc' subdirectory, Stefano Lattarini, 2012/08/29
- [PATCH 09/22] build: add an explicative comment, Stefano Lattarini, 2012/08/29
- [PATCH 07/22] build: don't define $(SUFFIXES) explicitly, Stefano Lattarini, 2012/08/29
- [PATCH 08/22] maint: simplify definition of $MAN in configure.ac,
Stefano Lattarini <=
- [PATCH 10/22] build: fix a stray usage of uninitialized $(ME), Stefano Lattarini, 2012/08/29
- [PATCH 12/22] maint: typofix: s/it's/its/, Stefano Lattarini, 2012/08/29
- [PATCH 11/22] build: rename common_dep -> mandep in man/Makefile, Stefano Lattarini, 2012/08/29
- [PATCH 14/22] build: make some rule less dependent of exact source tree layout, Stefano Lattarini, 2012/08/29
- [PATCH 13/22] build: rely on VPATH capabilities in man/Makefile, Stefano Lattarini, 2012/08/29
- [PATCH 15/22] build: convenience target 'all_programs' at top-level, Stefano Lattarini, 2012/08/29
- [PATCH 16/22] build: rework some recipes in main/Makefile.am, for future changes, Stefano Lattarini, 2012/08/29
- [PATCH 18/22] maint: move man-related syntax checks in cfg.mk, Stefano Lattarini, 2012/08/29
- [PATCH 20/22] maint: adjust syntax check 'sc_option_desc_uppercase', Stefano Lattarini, 2012/08/29
- [PATCH 19/22] maint: adjust syntax check 'check-x-vs-1', Stefano Lattarini, 2012/08/29