[PATCH 12/19] Rename `--with-config-suffix` configure option to `--with-config-infix`.

[G. Branden Robinson]

...because that's what it is.  Drop "etc." annotation from INSTALL
documentation; this option affects only ncurses*-config, not
adacurses*-config or anything else.
---
 INSTALL                    |  6 +++---
 configure.in               | 12 ++++++------
 misc/Makefile.in           |  2 +-
 package/debian/rules       |  2 +-
 package/mingw-ncurses.spec |  2 +-
 package/ncurses.spec       |  2 +-
 package/ncursest.spec      |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/INSTALL b/INSTALL
index 39a8a9f8..cb080ccf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -935,9 +935,9 @@ CONFIGURE OPTIONS:
        executables, e.g., by setting "--with-chtype=long" (the configure
        script supplies "unsigned").
 
-    --with-config-suffix=XXX
-       Specify a suffix for the ncursesw6-config file, etc., used to work
-       around conflicts with packages.
+    --with-config-infix=XXX
+       Specify an infix for the ncurses*-config file to work around conflicts
+       with packages.  The infix is placed before the dash.
 
     --with-cxx-libname=NAME
        Override the basename of the ncurses++ library (default: "ncurses++")
diff --git a/configure.in b/configure.in
index 178b7ae8..9c24732b 100644
--- a/configure.in
+++ b/configure.in
@@ -215,17 +215,17 @@ AC_SYS_LONG_FILE_NAMES
 
 # Provide for renaming "ncurses5-config" to "ncurses5X-config", etc., in case
 # of package conflict.
-cf_config_suffix=
-AC_ARG_WITH(config-suffix,
-       [  --with-config-suffix=X  suffixes ncursesXX-config file],
+cf_config_infix=
+AC_ARG_WITH(config-infix,
+       [  --with-config-infix=X   name ncurses*X-config file with infix X],
        [case "x$withval" in
        (xyes|xno)
                AC_MSG_WARN(expected a value for config-suffix option)
                ;;
-       (*)     cf_config_suffix="$withval"
+       (*)     cf_config_infix="$withval"
                ;;
        esac])
-AC_SUBST(cf_config_suffix)
+AC_SUBST(cf_config_infix)
 
 # If we find pkg-config, check if we should install the ".pc" files.
 CF_PKG_CONFIG
@@ -2433,7 +2433,7 @@ esac
 
 # Help to automatically enable the extended curses features when using either
 # the *-config or the ".pc" files by adding defines.
-AC_MSG_CHECKING(for defines to add to 
ncurses${USE_CFG_SUFFIX}${cf_config_suffix}-config script)
+AC_MSG_CHECKING(for defines to add to 
ncurses${USE_CFG_SUFFIX}${cf_config_infix}-config script)
 PKG_CFLAGS=
 for cf_loop1 in $CPPFLAGS_after_XOPEN
 do
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 1539973f..ab046578 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -126,7 +126,7 @@ sources ::
 install.data ::
        @echo "finished $@"
 
-NCURSES_CONFIG = 
ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_suffix@-config
+NCURSES_CONFIG = 
ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_infix@-config
 
 install \
 install.libs :: $(DESTDIR)$(bindir) ncurses-config
diff --git a/package/debian/rules b/package/debian/rules
index 7bfabfe0..150f7694 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -82,7 +82,7 @@ configure = \
                --program-suffix=$(MY_ABI) \
                --verbose \
                --with-abi-version=$(MY_ABI) \
-               --with-config-suffix=dev \
+               --with-config-infix=dev \
                --with-cxx-shared \
                --with-default-terminfo-dir=$(MYDATA) \
                --with-develop \
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 2786e9e1..f0a20c3d 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -63,7 +63,7 @@ This package is used for testing ABI %{MY_ABI} with 
cross-compiles to MinGW.
        --enable-warnings \\\
        --enable-wgetch-events \\\
        --enable-widec \\\
-       --with-config-suffix=dev \\\
+       --with-config-infix=dev \\\
        --verbose \\\
        --with-cxx-shared \\\
        --with-develop \\\
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 4058fa7f..015bd8f8 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -88,7 +88,7 @@ This package is used for testing ABI %{MY_ABI}.
        --program-suffix=%{MY_ABI} \\\
        --verbose \\\
        --with-abi-version=%{MY_ABI} \\\
-       --with-config-suffix=dev \\\
+       --with-config-infix=dev \\\
        --with-cxx-shared \\\
        --with-default-terminfo-dir=%{MYDATA} \\\
        --with-develop \\\
diff --git a/package/ncursest.spec b/package/ncursest.spec
index fa1041d1..60f3ec2a 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -85,7 +85,7 @@ This package is used for testing ABI %{MY_ABI} with POSIX 
threads.
        --program-suffix=%{MY_ABI} \\\
        --verbose \\\
        --with-abi-version=%{MY_ABI} \\\
-       --with-config-suffix=dev \\\
+       --with-config-infix=dev \\\
        --with-cxx-shared \\\
        --with-default-terminfo-dir=%{MYDATA} \\\
        --with-develop \\\
-- 
2.30.2

signature.asc
Description: PGP signature