From: Stefano Lattarini Date: Thu, 23 Feb 2012 18:21:00 +0000 (+0100) Subject: build: do not quote `like this', as per GCS recommendation X-Git-Tag: v1.11b~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d9519836f51f8b4c01d6b134b124f03a51a1ecd;p=thirdparty%2Fautomake.git build: do not quote `like this', as per GCS recommendation This patch converts the files implementing the automake's own build system to the use of new quoting format 'like this' or "like this" rather than `like this'. * bootstrap, configure.ac, syntax-checks.mk, Makefile.am, lib/Makefile.am, m4/Makefile.am, syntax-checks.mk: Update quoting format throughout, in comments and diagnostic. Some minor related rewordings and reformatting since we are at it. --- diff --git a/Makefile.am b/Makefile.am index a7aed453a..a06cd8d94 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ ## lib goes first, because it builds Config.pm, used by aclocal and ## automake (run in doc, tests, and in the rebuild rules.) -## `.' goes before doc and tests, because the latter two directories +## '.' goes before doc and tests, because the latter two directories ## run aclocal and automake. SUBDIRS = lib . contrib doc m4 tests @@ -97,7 +97,7 @@ automake aclocal: Makefile $(AM_V_at)chmod a+x,a-w $@-t && mv -f $@-t $@ ## The master location for INSTALL is lib/INSTALL. -## This is where `make fetch' will install new versions. +## This is where "make fetch" will install new versions. ## Make sure we also update this copy. INSTALL: lib/INSTALL $(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@ @@ -128,9 +128,9 @@ gitlog_to_changelog_options = --amend=$(gitlog_to_changelog_fixes) \ # give an error). # # We need the apparently useless dependency from another .PHONY target -# `am--changelog-regen-hook' to work around a bug of Solaris make, which +# 'am--changelog-regen-hook' to work around a bug of Solaris make, which # doesn't execute the recipe of a target named as an existing file, even -# if such target is declared `.PHONY' (yikes!) +# if such target is declared '.PHONY' (yikes!) # .PHONY: am--changelog-regen-hook am--changelog-regen-hook: @@ -171,8 +171,8 @@ check-coverage-run recheck-coverage-run: all check-coverage-report: @if test ! -d "$(PERL_COVERAGE_DB)"; then \ - echo "No coverage database found in \`$(PERL_COVERAGE_DB)'." >&2; \ - echo "Please run \`make check-coverage' first" >&2; \ + echo "No coverage database found in '$(PERL_COVERAGE_DB)'." >&2; \ + echo "Please run \"make check-coverage\" first" >&2; \ exit 1; \ fi $(PERL_COVER) $(PERL_COVER_FLAGS) "$(PERL_COVERAGE_DB)" diff --git a/bootstrap b/bootstrap index 04b524cc8..c6257166e 100755 --- a/bootstrap +++ b/bootstrap @@ -68,7 +68,7 @@ if test -d automake-$APIVERSION; then find automake-$APIVERSION -exec chmod u+wx '{}' ';' fi rm -rf automake-$APIVERSION -# Can't use `ln -s lib automake-$APIVERSION', that would create a +# Can't use "ln -s lib automake-$APIVERSION", that would create a # lib.exe stub under DJGPP 2.03. mkdir automake-$APIVERSION cp -rf lib/* automake-$APIVERSION @@ -110,7 +110,7 @@ mv -f testsuite-part.tmp testsuite-part.am cd .. # Run the autotools. -# Use `-I' here so that our own *.m4 files in m4/ gets included, +# Use '-I' here so that our own *.m4 files in m4/ gets included, # not copied, in aclocal.m4. $PERL ./aclocal.tmp -I m4 --automake-acdir m4 --system-acdir m4/acdir $AUTOCONF diff --git a/configure.ac b/configure.ac index eed1c3c82..0db7304df 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,7 @@ AC_CANONICAL_BUILD # Save the AUTOCONF setting before AM_INIT_AUTOMAKE overrides it; this # way we can run Autoconf tests from configure (or from the test -# suite) without being bothered by `missing'. Likewise for autom4te, +# suite) without being bothered by 'missing'. Likewise for autom4te, # autoreconf, autoheader, and autoupdate. AC_SUBST([am_AUTOCONF], ["${AUTOCONF-autoconf}"]) AC_SUBST([am_AUTOM4TE], ["${AUTOM4TE-autom4te}"]) @@ -37,7 +37,7 @@ AC_SUBST([am_AUTOHEADER], ["${AUTOHEADER-autoheader}"]) AC_SUBST([am_AUTOUPDATE], ["${AUTOUPDATE-autoupdate}"]) dnl We call AC_PROG_CC in an unusual way, and only for use in our -dnl testsuite, so also use `no-dependencies' and `no-define' among +dnl testsuite, so also use 'no-dependencies' and 'no-define' among dnl the automake options to avoid bloating and potential problems. AM_INIT_AUTOMAKE([1.10a dist-xz filename-length-max=99 color-tests parallel-tests silent-rules no-define no-dependencies]) @@ -58,8 +58,8 @@ AC_SUBST([amdir], ["\${pkgvdatadir}/am"]) AC_SUBST([automake_acdir], ["\${datadir}/aclocal-$APIVERSION"]) AC_SUBST([system_acdir], ["\${datadir}/aclocal"]) -# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir', -# hence `.' is really what we want for perllibdir, libdir, and acdir. +# $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir", +# hence '.' is really what we want for perllibdir, libdir, and acdir. ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" --acdir=m4 -I m4" AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" --libdir=lib" @@ -217,10 +217,9 @@ else fi ]) if test $am_cv_sh_errexit_works = no; then - AC_MSG_WARN([`${MAKE-make} check' will leave leftover directories tests/*.dir]) - AC_MSG_WARN([you can clean them up manually using `${MAKE-make} clean' or]) - AC_MSG_WARN([`cd tests && ${MAKE-make} clean-local-check']) - dnl restore font-lock: ` + AC_MSG_WARN(["${MAKE-make} check" will leave leftover directories tests/*.dir]) + AC_MSG_WARN([you can clean them up manually using "${MAKE-make} clean" or]) + AC_MSG_WARN(["cd tests && ${MAKE-make} clean-local-check']) fi AC_SUBST([sh_errexit_works], [$am_cv_sh_errexit_works]) @@ -276,7 +275,7 @@ _AM_COMPILER_CAN_FAIL([AC_PROG_CC([cc gcc])], [CC=false]) AS_IF([test x"$GCC" = x"yes"], [am_CC_is_GNU=yes], [am_CC_is_GNU=no]) # The list of C++ compilers here has been copied, pasted and edited -# from `lib/autoconf/c.m4:AC_PROG_CXX' in the Autoconf distribution. +# from 'lib/autoconf/c.m4:AC_PROG_CXX' in the Autoconf distribution. # Keep it in sync, or better again, find out a way to avoid this code # duplication. _AM_COMPILER_CAN_FAIL([AC_PROG_CXX(dnl @@ -285,7 +284,7 @@ _AM_COMPILER_CAN_FAIL([AC_PROG_CXX(dnl AS_IF([test x"$GXX" = x"yes"], [am_CXX_is_GNU=yes], [am_CXX_is_GNU=no]) # The lists of Fortran compilers here has been copied, pasted and edited -# from file `lib/autoconf/fortran.m4' in the Autoconf distribution. +# from file 'lib/autoconf/fortran.m4' in the Autoconf distribution. # Keep it in sync, or better again, find out a way to avoid this code # duplication. diff --git a/lib/Makefile.am b/lib/Makefile.am index fe8bfa608..422544e28 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -54,7 +54,7 @@ install-data-hook: chmod +x "$(DESTDIR)$(scriptdir)/$$prog"; \ done -## `test -x' is not portable. So we use Perl instead. If Perl +## 'test -x' is not portable. So we use Perl instead. If Perl ## doesn't exist, then this test is meaningless anyway. installcheck-local: for file in $(dist_script_DATA); do \ diff --git a/m4/Makefile.am b/m4/Makefile.am index 2f5ead33f..29e5e05ad 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -65,7 +65,7 @@ EXTRA_DIST = acdir/.placeholder amversion.in # dependencies change and amversion.m4 happens to be a configure # dependency. configure and amversion.m4 would be rebuilt in # loop otherwise. -# Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is +# Use '$(top_srcdir)/m4' for the benefit of non-GNU makes: this is # how amversion.m4 appears in our dependencies. $(top_srcdir)/m4/amversion.m4: $(top_srcdir)/configure.ac $(srcdir)/amversion.in $(AM_V_at)sed \ diff --git a/syntax-checks.mk b/syntax-checks.mk index 254c3ab6b..8df0f198a 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -16,9 +16,9 @@ # along with this program. If not, see . # We also have to take into account VPATH builds (where some generated -# tests might be in `$(builddir)' rather than in `$(srcdir)'), TAP-based -# tests script (which have a `.tap' extension) and helper scripts used -# by other test cases (which have a `.sh' extension). +# tests might be in '$(builddir)' rather than in '$(srcdir)'), TAP-based +# tests script (which have a '.tap' extension) and helper scripts used +# by other test cases (which have a '.sh' extension). xtests := $(shell \ if test $(srcdir) = .; then \ dirs=.; \ @@ -185,7 +185,7 @@ sc_no_brace_variable_expansions: exit 1; \ else :; fi -## Make sure `rm' is called with `-f'. +## Make sure 'rm' is called with '-f'. sc_rm_minus_f: @if grep -v '^#' $(ams) $(xtests) \ | grep -E '\)'; \ @@ -194,7 +194,7 @@ sc_rm_minus_f: exit 1; \ else :; fi -## Never use something like `for file in $(FILES)', this doesn't work +## Never use something like "for file in $(FILES)", this doesn't work ## if FILES is empty or if it contains shell meta characters (e.g. $ is ## commonly used in Java filenames). sc_no_for_variable_in_macro: @@ -265,10 +265,10 @@ sc_perl_at_uscore_in_scalar_context: exit 1; \ fi -## Forbid using parens with `local' to ease counting. +## Forbid using parens with 'local' to ease counting. sc_perl_local_no_parens: @if grep '^[ \t]*local *(' $(srcdir)/automake.in; then \ - echo "Don't use \`local' with parens: use several \`local' above." >&2; \ + echo "Don't use 'local' with parens: use several 'local' above." >&2; \ exit 1; \ fi @@ -276,7 +276,7 @@ sc_perl_local_no_parens: sc_perl_local: @if egrep -v '^[ \t]*local \$$[_~]( *=|;)' $(srcdir)/automake.in | \ grep '^[ \t]*local [^*]'; then \ - echo "Please avoid \`local'." 1>&2; \ + echo "Please avoid 'local'." 1>&2; \ exit 1; \ fi @@ -417,7 +417,7 @@ sc_tests_plain_perl: exit 1; \ fi -## Setting `required' after sourcing `./defs' is a bug. +## Setting 'required' after sourcing './defs' is a bug. sc_tests_required_after_defs: @for file in $(xtests); do \ if out=`sed -n '/defs/,$${/required=/p;}' $$file`; test -n "$$out"; then \ @@ -468,8 +468,8 @@ sc_tests_overriding_macros_on_cmdline: exit 1; \ fi -## Never use `sleep 1' to create files with different timestamps. -## Use `$sleep' instead. Some filesystems (e.g., Windows') have only +## Never use 'sleep 1' to create files with different timestamps. +## Use '$sleep' instead. Some filesystems (e.g., Windows) have only ## a 2sec resolution. sc_tests_plain_sleep: @if grep -E '\bsleep +[12345]\b' $(xtests); then \ @@ -503,13 +503,15 @@ sc_tests_no_configure_in: exit 1; \ fi -## Rule to ensure that the testsuite has been run before. We don't depend on `check' -## here, because that would be very wasteful in the common case. We could run -## `make check RECHECK_LOGS=' and avoid toplevel races with AM_RECURSIVE_TARGETS. -## Suggest keeping test directories around for greppability of the Makefile.in files. +## Rule to ensure that the testsuite has been run before. We don't depend +## on 'check' here, because that would be very wasteful in the common case. +## We could run "make check RECHECK_LOGS=" and avoid toplevel races with +## AM_RECURSIVE_TARGETS. Suggest keeping test directories around for +## greppability of the Makefile.in files. sc_ensure_testsuite_has_run: @if test ! -f tests/test-suite.log; then \ - echo "Run \`env keep_testdirs=yes make check' before \`maintainer-check'" >&2; \ + echo 'Run "env keep_testdirs=yes make check" before' \ + 'running "make maintainer-check"' >&2; \ exit 1; \ fi .PHONY: sc_ensure_testsuite_has_run @@ -544,10 +546,11 @@ sc_tests_makefile_variable_order: sc_ensure_testsuite_has_run exit 1; \ } -## Using `:' as a PATH separator is not portable. +## Using ':' as a PATH separator is not portable. sc_tests_PATH_SEPARATOR: @if grep -E '\bPATH=.*:.*' $(xtests) ; then \ - echo "Use \`\$$PATH_SEPARATOR', not \`:', in PATH definitions above." 1>&2; \ + echo "Use '\$$PATH_SEPARATOR', not ':', in PATH definitions" \ + "above." 1>&2; \ exit 1; \ fi