* Rename `THIS` to `CURSES_LIB`. Update expansion sites. * Populate `TINFO_LIB` with the catenation of `@TINFO_NAME@` and `@ABI_SUFFIX@`, in parallel with `CURSES_LIB`'s definition. --- misc/ncurses-config.in | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 4a8f5c2be..56e70de19 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -46,8 +46,8 @@ datarootdir="@datarootdir@"
datadir="@datadir@"
mandir="@mandir@"
-THIS="@LIB_NAME@@ABI_SUFFIX@"
-TINFO_LIB="@TINFO_ARG_SUFFIX@"
+CURSES_LIB="@LIB_NAME@@ABI_SUFFIX@"
+TINFO_LIB="@TINFO_NAME@@ABI_SUFFIX@"
RPATH_LIST="@RPATH_LIST@"
# Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
@@ -78,7 +78,7 @@ fi
# the headers to include like this:
# <ncurses@LIB_SUFFIX@/curses.h>
if [ x@WITH_OVERWRITE@ = xno ]; then
- includesubdir="@includedir@/${THIS}"
+ includesubdir="@includedir@/${CURSES_LIB}"
case $includedir in
$prefix/include/ncurses@LIB_SUFFIX@@EXTRA_SUFFIX@)
includedir=`echo "$includedir" | sed -e 's,/[^/]*$,,'`
@@ -90,9 +90,9 @@ fi
LIBS="@LIBS@"
if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then
- LIBS="-l${THIS} $LIBS"
+ LIBS="-l${CURSES_LIB} $LIBS"
else
- LIBS="-l${THIS} -l${TINFO_LIB} $LIBS"
+ LIBS="-l${CURSES_LIB} -l${TINFO_LIB} $LIBS"
fi
CFLAGS="@PKG_CFLAGS@"
@@ -344,27 +344,27 @@ while [ $# -gt 0 ]; do
Usage: `basename "$0"` [options]
Options:
- --prefix echos the package-prefix of ${THIS}
- --exec-prefix echos the executable-prefix of ${THIS}
+ --prefix echos the package-prefix of ${CURSES_LIB}
+ --exec-prefix echos the executable-prefix of ${CURSES_LIB}
- --cflags echos the C compiler flags needed to compile for ${THIS}
- --cflags-only-I echos only -I C compiler flags needed with ${THIS}
- --cflags-only-other echos only C compiler flags other than -I for ${THIS}
- --libs echos the libraries needed to link with ${THIS}
+ --cflags echos the C compiler flags needed to compile for
${CURSES_LIB}
+ --cflags-only-I echos only -I C compiler flags needed with ${CURSES_LIB}
+ --cflags-only-other echos only C compiler flags other than -I for
${CURSES_LIB}
+ --libs echos the libraries needed to link with ${CURSES_LIB}
- --libs-only-L echos -L linker options (search path) for ${THIS}
- --libs-only-l echos -l linker options (libraries) for ${THIS}
+ --libs-only-L echos -L linker options (search path) for ${CURSES_LIB}
+ --libs-only-l echos -l linker options (libraries) for ${CURSES_LIB}
--libs-only-other echos linker options other than -L/-l
- --version echos the release+patchdate version of ${THIS}
- --abi-version echos the ABI version of ${THIS}
- --mouse-version echos the mouse-interface version of ${THIS}
+ --version echos the release+patchdate version of ${CURSES_LIB}
+ --abi-version echos the ABI version of ${CURSES_LIB}
+ --mouse-version echos the mouse-interface version of ${CURSES_LIB}
- --bindir echos the directory containing ${THIS} programs
- --datadir echos the directory containing ${THIS} data
- --includedir echos the directory containing ${THIS} header files
- --libdir echos the directory containing ${THIS} libraries
- --mandir echos the directory containing ${THIS} manpages
+ --bindir echos the directory containing ${CURSES_LIB} programs
+ --datadir echos the directory containing ${CURSES_LIB} data
+ --includedir echos the directory containing ${CURSES_LIB} header files
+ --libdir echos the directory containing ${CURSES_LIB} libraries
+ --mandir echos the directory containing ${CURSES_LIB} manpages
--terminfo echos the \$TERMINFO terminfo database path
--terminfo-dirs echos the \$TERMINFO_DIRS directory list
--termpath echos the \$TERMPATH termcap list
--
2.30.2
signature.asc
Description: PGP signature
