ncurses 6.2 - patch 20210123

+ modify package/config scripts to provide an explicit -L option for
  cases when the loader search path has other directories preceding
  the one in which ncurses is installed (report by Yuri Victorovich).
+ minor build-fixes in configure script and makefiles to work around
  quirks of pmake.

diff --git a/Ada95/Makefile.in b/Ada95/Makefile.in
index 67625d7e9cda83c60479f9ed6e6737ddf91b55bb..8d78bbf4f19c4335d73c6d9cc51fb4062d7f77de 100644 (file)
--- a/Ada95/Makefile.in
+++ b/Ada95/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.23 2020/02/02 23:34:34 tom Exp $
+# $Id: Makefile.in,v 1.26 2021/01/23 20:34:50 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2021 Thomas E. Dickey                                       #
 # Copyright 1998-2010,2015 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -31,7 +31,7 @@
 #  Author:  Juergen Pfeifer, 1996
 #
 #  Version Control
-#  $Revision: 1.23 $
+#  $Revision: 1.26 $
 #
 SHELL          = @SHELL@
 VPATH          = @srcdir@
@@ -39,7 +39,7 @@ THIS          = Makefile
 
 SUBDIRS         = @ADA_SUBDIRS@
 
-CF_MFLAGS      = @cf_cv_makeflags@
+TOP_MFLAGS     = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
 @SET_MAKE@
 
 all \
@@ -50,19 +50,19 @@ install.libs \
 uninstall \
 uninstall.libs ::
        for d in $(SUBDIRS); do \
-               (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\
+               ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\
        done
 
 clean \
 mostlyclean ::
        for d in $(SUBDIRS); do \
-               (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\
+               ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\
        done
 
 distclean \
 realclean ::
        for d in $(SUBDIRS); do \
-               (cd $$d ; $(MAKE) $(CF_MFLAGS) $@) ;\
+               ( cd $$d && $(MAKE) $(TOP_MFLAGS) $@ ) ;\
        done
        rm -rf lib
        for lib_kind in static dynamic; do \

diff --git a/Ada95/doc/Makefile.in b/Ada95/doc/Makefile.in
index 3ef39000e7ba1a58c610683e49f5bf60263e35e6..bde5c6112f5140d2670c8d314c3c872a5b264c61 100644 (file)
--- a/Ada95/doc/Makefile.in
+++ b/Ada95/doc/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.7 2020/02/02 23:34:34 tom Exp $
+# $Id: Makefile.in,v 1.8 2021/01/23 20:42:08 tom Exp $
 ##############################################################################
-# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
 # Copyright 2011-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -69,7 +69,7 @@ uninstall uninstall.man :
 
 # HTML documentation is optional, usually in a separate package.
 install.html : $(DOCDIR)
-       cd $(srcdir) && tar -cf - *.htm* ada | tar -C $(DOCDIR) -xf -
+       ( cd $(srcdir) && tar -cf - *.htm* ada | tar -C $(DOCDIR) -xf - )
 
 uninstall.html :
        -rm -rf $(DOCDIR)

diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index 3518b60f602f1450bc79f33a25e74b561804fa9c..13835743f95e1c3bba66548789e595fdf8fe2c26 100644 (file)
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2019,2020 Thomas E. Dickey                                       #
+# Copyright 2019-2020,2021 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -30,7 +30,7 @@
 #  Author:  Juergen Pfeifer, 1996
 #     and:  Thomas E. Dickey, 1997
 #
-#  $Id: Makefile.in,v 1.95 2020/08/29 16:58:25 tom Exp $
+#  $Id: Makefile.in,v 1.96 2021/01/23 20:42:08 tom Exp $
 #
 .SUFFIXES:
 
@@ -311,7 +311,7 @@ adahtml:
        test -n "$(GNATHTML)" || exit 1
        @find $(HTML_DIR) -type f -exec rm -f {} \;
        @mkdir -p $(HTML_DIR)
-       cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb]
+       ( cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb] )
 @USE_OLD_MAKERULES@    ln -sf ../src/*.ali .
 @USE_GNAT_PROJECTS@    ln -sf ../static-ali/*.ali .
        @echo "Filtering generated files"

diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in
index f7cd1e883e8ad01ebbc735ca83b78c3838d22880..3a0c272f409228fea5684263226284a6ab3255c8 100644 (file)
--- a/Ada95/samples/Makefile.in
+++ b/Ada95/samples/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.61 2020/08/29 17:01:19 tom Exp $
+#  $Id: Makefile.in,v 1.62 2021/01/23 20:42:08 tom Exp $
 #
 .SUFFIXES:
 
@@ -131,7 +131,7 @@ install.examples :: $(MY_DATADIR)
        $(INSTALL_DATA) explain.txt $(MY_DATADIR)
 
 uninstall.examples ::
-       -cd $(BINDIR) && rm -f $(PROGS)
+       -( cd $(BINDIR) && rm -f $(PROGS) )
        -rmdir $(BINDIR)
        -rm -f $(MY_DATADIR)/explain.txt
        -rmdir $(MY_DATADIR)

diff --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in
index 5855a107b12b23e24a9af307fa7a27934b70d0e3..8360779ec8308044986740c9b083e1f4540657ea 100644 (file)
--- a/Ada95/src/Makefile.in
+++ b/Ada95/src/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 1999-2016,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -29,7 +29,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.94 2020/12/05 21:19:40 tom Exp $
+#  $Id: Makefile.in,v 1.95 2021/01/23 20:42:08 tom Exp $
 #
 .SUFFIXES:
 
@@ -184,7 +184,7 @@ $(BUILD_DIR_LIB) :
        mkdir -p $@
 
 $(GENERATED_SOURCES) :
-       cd ../gen; $(MAKE) $(ADA_MFLAGS)
+       ( cd ../gen; $(MAKE) $(ADA_MFLAGS) )
 
 sources : $(GENERATED_SOURCES)
        @echo made $@
@@ -391,7 +391,7 @@ uninstall.libs ::
 @MAKE_ADA_SHAREDLIB@   $(INSTALL_LIB) \
 @MAKE_ADA_SHAREDLIB@           $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) \
 @MAKE_ADA_SHAREDLIB@           $(LIBDIR)
-@MAKE_ADA_SHAREDLIB@   cd $(LIBDIR) && $(LN_S) $(SHARED_LIBNAME) $(SHARED_SYMLINK)
+@MAKE_ADA_SHAREDLIB@   ( cd $(LIBDIR) && $(LN_S) $(SHARED_LIBNAME) $(SHARED_SYMLINK) )
 @MAKE_ADA_SHAREDLIB@
 @MAKE_ADA_SHAREDLIB@uninstall \
 @MAKE_ADA_SHAREDLIB@uninstall.libs ::

diff --git a/NEWS b/NEWS
index c04424f4ffbf88a71206ea4f1f6f0bb48b2904ed..3ef2cae12c784e36afd5b75c8860eb3d7aadc3e3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3619 2021/01/17 00:50:16 tom Exp $
+-- $Id: NEWS,v 1.3622 2021/01/23 23:31:40 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -46,6 +46,13 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20210123
+       + modify package/config scripts to provide an explicit -L option for
+         cases when the loader search path has other directories preceding
+         the one in which ncurses is installed (report by Yuri Victorovich).
+       + minor build-fixes in configure script and makefiles to work around
+         quirks of pmake.
+
 20210116
        + add comment for linux2.6 regarding CONFIG_CONSOLE_TRANSLATIONS
          (report by Patrick McDermott) -TD

diff --git a/VERSION b/VERSION
index 75a9a0756cf5e4ae858879882cdcc4526291fcc6..2f258bdd1d0a1c72040a6e4d0f42b70b9a3b7957 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.2     20210116
+5:0:10 6.2     20210123

diff --git a/aclocal.m4 b/aclocal.m4
index eaaf235cab576a30e8322c51a020acefe3ca0c7f..87d508e34353bcd585c041e33d8bd7a36c1ab10c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.947 2021/01/09 10:23:08 tom Exp $
+dnl $Id: aclocal.m4,v 1.949 2021/01/23 20:39:11 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -4225,7 +4225,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 93 updated: 2021/01/04 18:48:01
+dnl CF_LIB_RULES version: 94 updated: 2021/01/23 15:37:41
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -4606,7 +4606,7 @@ CF_EOF
                done
        fi
 
-       echo '  cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@' >>Makefile
+       echo '  ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@ )' >>Makefile
 done
 
 for cf_dir in $SRC_SUBDIRS
@@ -4621,7 +4621,7 @@ do
                        echo 'libs \' >> Makefile
                        echo 'install.libs \' >> Makefile
                        echo 'uninstall.libs ::' >> Makefile
-                       echo '  cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@' >> Makefile
+                       echo '  ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} [$]@ )' >> Makefile
                        ;;
                esac
        fi
@@ -4644,7 +4644,7 @@ install.libs \\
 uninstall.libs \\
 install.$cf_dir \\
 uninstall.$cf_dir ::
-       cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \[$]@
+       ( cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \[$]@ )
 CF_EOF
        elif test -f "$srcdir/$cf_dir/headers" ; then
 cat >> Makefile <<CF_EOF
@@ -4654,7 +4654,7 @@ install.libs \\
 uninstall.libs \\
 install.includes \\
 uninstall.includes ::
-       cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \[$]@
+       ( cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \[$]@ )
 CF_EOF
 fi
 done
@@ -4664,13 +4664,13 @@ cat >> Makefile <<CF_EOF
 
 install.libs uninstall.libs \\
 install.data uninstall.data ::
-$MAKE_TERMINFO cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@
+$MAKE_TERMINFO ( cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@ )
 CF_EOF
 else
 cat >> Makefile <<CF_EOF
 
 install.libs uninstall.libs ::
-       cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@
+       ( cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@ )
 CF_EOF
 fi
 
@@ -4679,7 +4679,7 @@ cat >> Makefile <<CF_EOF
 
 install.man \\
 uninstall.man ::
-       cd man && \${MAKE} \${TOP_MFLAGS} \[$]@
+       ( cd man && \${MAKE} \${TOP_MFLAGS} \[$]@ )
 CF_EOF
 fi
 
@@ -4699,7 +4699,7 @@ cat >> Makefile <<CF_EOF
 
 install.man \\
 uninstall.man ::
-       cd tack && \${MAKE} \${TOP_MFLAGS} \[$]@
+       ( cd tack && \${MAKE} \${TOP_MFLAGS} \[$]@ )
 CF_EOF
 fi
 fi

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 1efb2691d3e2e513076a9e1ca225bee631facc07..c1c0db703cf83a1a2b5d85bee080a9362904e699 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.127 2020/09/05 19:01:14 tom Exp $
+# $Id: Makefile.in,v 1.128 2021/01/23 20:42:08 tom Exp $
 ##############################################################################
-# Copyright 2018,2020 Thomas E. Dickey                                       #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 1998-2015,2016 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -226,13 +226,13 @@ cursesapp_h       = $(srcdir)/cursesapp.h \
                  $(cursslk_h)
 
 $(INCDIR)/form.h :
-       cd ../form && $(MAKE) $@
+       ( cd ../form && $(MAKE) $@ )
 
 $(INCDIR)/menu.h :
-       cd ../menu && $(MAKE) $@
+       ( cd ../menu && $(MAKE) $@ )
 
 $(INCDIR)/panel.h :
-       cd ../panel && $(MAKE) $@
+       ( cd ../panel && $(MAKE) $@ )
 
 ###############################################################################
 
@@ -244,7 +244,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
                $(cursesm_h) \
                $(cursesapp_h)
        @echo 'compiling demo (obj_s)'
-       @cd $(MODEL) && $(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(top_srcdir)/c++/demo.cc -o $@
+       @( cd $(MODEL) && $(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(top_srcdir)/c++/demo.cc -o $@ )
 
 demo$x:        $(OBJS_DEMO) \
        $(LIBRARIES)  \

diff --git a/configure b/configure
index c4ee4ce142c85f9d1e659b7b316bc64e45d6f4aa..34a2772fed8ae0e8984700e4bf3b2d04d739cff5 100755 (executable)
--- a/configure
+++ b/configure
@@ -30082,7 +30082,7 @@ eval cf_libname="\$${cf_map_lib_basename}_NAME"
                done
        fi
 
-       echo '  cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@' >>Makefile
+       echo '  ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@ )' >>Makefile
 done
 
 for cf_dir in $SRC_SUBDIRS
@@ -30097,7 +30097,7 @@ do
                        echo 'libs \' >> Makefile
                        echo 'install.libs \' >> Makefile
                        echo 'uninstall.libs ::' >> Makefile
-                       echo '  cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@' >> Makefile
+                       echo '  ( cd '$cf_dir' && ${MAKE} ${TOP_MFLAGS} $@ )' >> Makefile
                        ;;
                esac
        fi
@@ -30120,7 +30120,7 @@ install.libs \\
 uninstall.libs \\
 install.$cf_dir \\
 uninstall.$cf_dir ::
-       cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \$@
+       ( cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \$@ )
 CF_EOF
        elif test -f "$srcdir/$cf_dir/headers" ; then
 cat >> Makefile <<CF_EOF
@@ -30130,7 +30130,7 @@ install.libs \\
 uninstall.libs \\
 install.includes \\
 uninstall.includes ::
-       cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \$@
+       ( cd "$cf_dir" && \${MAKE} \${TOP_MFLAGS} \$@ )
 CF_EOF
 fi
 done
@@ -30140,13 +30140,13 @@ cat >> Makefile <<CF_EOF
 
 install.libs uninstall.libs \\
 install.data uninstall.data ::
-$MAKE_TERMINFO cd misc && \${MAKE} \${TOP_MFLAGS} \$@
+$MAKE_TERMINFO ( cd misc && \${MAKE} \${TOP_MFLAGS} \$@ )
 CF_EOF
 else
 cat >> Makefile <<CF_EOF
 
 install.libs uninstall.libs ::
-       cd misc && \${MAKE} \${TOP_MFLAGS} \$@
+       ( cd misc && \${MAKE} \${TOP_MFLAGS} \$@ )
 CF_EOF
 fi
 
@@ -30155,7 +30155,7 @@ cat >> Makefile <<CF_EOF
 
 install.man \\
 uninstall.man ::
-       cd man && \${MAKE} \${TOP_MFLAGS} \$@
+       ( cd man && \${MAKE} \${TOP_MFLAGS} \$@ )
 CF_EOF
 fi
 
@@ -30175,7 +30175,7 @@ cat >> Makefile <<CF_EOF
 
 install.man \\
 uninstall.man ::
-       cd tack && \${MAKE} \${TOP_MFLAGS} \$@
+       ( cd tack && \${MAKE} \${TOP_MFLAGS} \$@ )
 CF_EOF
 fi
 fi

diff --git a/dist.mk b/dist.mk
index a070f9667288c522ee2da831ea84957fc2a5fa8b..d4a50826b6b1fe62c7550e11e8277c11cb4dd043 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1396 2021/01/16 10:31:57 tom Exp $
+# $Id: dist.mk,v 1.1397 2021/01/23 15:02:30 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2
-NCURSES_PATCH = 20210116
+NCURSES_PATCH = 20210123
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/form/Makefile.in b/form/Makefile.in
index 20b5bbc5943cb7970fbfd2d90b65d85d2db9577d..3d713469fe0c75e21048fad6863f2d3aace9f471 100644 (file)
--- a/form/Makefile.in
+++ b/form/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.70 2020/08/29 14:50:45 tom Exp $
+# $Id: Makefile.in,v 1.71 2021/01/23 20:42:08 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2021 Thomas E. Dickey                                       #
 # Copyright 1998-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -190,7 +190,7 @@ realclean :: distclean
 
 ../include/mf_common.h \
 ../include/eti.h :
-       cd ../menu && $(MAKE) $@
+       ( cd ../menu && $(MAKE) $@ )
 
 ###############################################################################
 # The remainder of this file is automatically generated during configuration

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 1d83da8fab5cf08013fa3b8d030f495c7c8297de..3999a4e9bd1bdf07327c2fecdace9ca23d43c65e 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.73 2020/02/02 23:34:34 tom Exp $
+# $Id: Makefile.in,v 1.74 2021/01/23 20:42:08 tom Exp $
 ##############################################################################
-# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -101,12 +101,12 @@ depend :
 @MAKE_DATABASE@        source=terminfo.tmp \
 @MAKE_DATABASE@        cross_compiling=@cross_compiling@ \
 @MAKE_DATABASE@        $(SHELL) ./run_tic.sh
-@MAKE_DATABASE@        @cd $(srcdir)/tabset && \
+@MAKE_DATABASE@        @( cd $(srcdir)/tabset && \
 @MAKE_DATABASE@                $(SHELL) -c 'for i in * ; do \
 @MAKE_DATABASE@                        if test -f $$i ; then \
 @MAKE_DATABASE@                        echo installing $$i; \
 @MAKE_DATABASE@                        $(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \
-@MAKE_DATABASE@                        fi; done'
+@MAKE_DATABASE@                        fi; done' )
 install.data ::
        @echo "finished $@"
 

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 134893816f8beca3a0dec3d11fc0d03bf3d7fb87..5a71ab0203c67098db6a9f68685e6f7fc797df11 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: gen-pkgconfig.in,v 1.46 2020/05/23 17:56:46 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.49 2021/01/24 00:35:28 tom Exp $
 ##############################################################################
-# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 2009-2015,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -96,10 +96,43 @@ do
                continue
                ;;
        -L*)
-               [ -d ${opt##-L} ] || continue
-               case ${opt##-L} in
+               lib_check=${opt##-L} 
+               [ -d "$lib_check" ] || continue
+               case "$lib_check" in
                @LD_SEARCHPATH@) # skip standard libdir
-                       continue
+                       if [ "$lib_check" = "$libdir" ]
+                       then
+                               lib_first=yes
+                               IFS_save="$IFS"
+                               IFS='|'
+                               LIBDIRS="@LD_SEARCHPATH@"
+                               for lib_check in $LIBDIRS
+                               do
+                                       if [ -d "$lib_check" ]
+                                       then
+                                               if [ "$lib_check" != "$libdir" ]
+                                               then
+                                                       lib_first=no
+                                               fi
+                                               break
+                                       fi
+                               done
+                               IFS="$IFS_save"
+                               [ $lib_first = yes ] && continue
+                               found=no
+                               for check in $lib_flags
+                               do
+                                       if [ "x$check" = "x$opt" ]
+                                       then
+                                               found=yes
+                                               break
+                                       fi
+                               done
+                               [ $found = yes ] && continue
+                               :
+                       else
+                               continue
+                       fi
                        ;;
                *)
                        found=no

diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index a4b89c5a5428ea3669ccb8deb58c1b77b145e9dc..eae39a516ff3bbd9f99723939434023d8eaa1bc2 100644 (file)
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -1,7 +1,7 @@
 #!@SHELL@
-# $Id: ncurses-config.in,v 1.44 2020/05/23 17:56:52 tom Exp $
+# $Id: ncurses-config.in,v 1.46 2021/01/23 23:47:46 tom Exp $
 ##############################################################################
-# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 2006-2015,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -111,10 +111,43 @@ do
                continue
                ;;
        -L*)
-               [ -d ${opt##-L} ] || continue
-               case ${opt##-L} in
+               lib_check=${opt##-L} 
+               [ -d "$lib_check" ] || continue
+               case "$lib_check" in
                @LD_SEARCHPATH@) # skip standard libdir
-                       continue
+                       if [ "$lib_check" = "$libdir" ]
+                       then
+                               lib_first=yes
+                               IFS_save="$IFS"
+                               IFS='|'
+                               LIBDIRS="@LD_SEARCHPATH@"
+                               for lib_check in $LIBDIRS
+                               do
+                                       if [ -d "$lib_check" ]
+                                       then
+                                               if [ "$lib_check" != "$libdir" ]
+                                               then
+                                                       lib_first=no
+                                               fi
+                                               break
+                                       fi
+                               done
+                               IFS="$IFS_save"
+                               [ $lib_first = yes ] && continue
+                               found=no
+                               for check in $lib_flags
+                               do
+                                       if [ "x$check" = "x$opt" ]
+                                       then
+                                               found=yes
+                                               break
+                                       fi
+                               done
+                               [ $found = yes ] && continue
+                               :
+                       else
+                               continue
+                       fi
                        ;;
                *)
                        found=no

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index cfe1a4ac0365104657561f9a1bada3aff0ff273b..8f2254d3a0d48de722ddb83d68aa95dfb6821d18 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.176 2020/09/05 18:58:52 tom Exp $
+# $Id: Makefile.in,v 1.178 2021/01/23 20:34:00 tom Exp $
 ##############################################################################
-# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
 # Copyright 1998-2017,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -50,7 +50,7 @@ SHELL         = @SHELL@
 VPATH          = @srcdir@
 THIS           = Makefile
 
-CF_MFLAGS      = @cf_cv_makeflags@
+TOP_MFLAGS     = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
 @SET_MAKE@
 
 x              = @EXEEXT@
@@ -244,7 +244,7 @@ keys.list : $(tinfo)/MKkeys_list.sh
 make_keys$(BUILD_EXEEXT) : \
                build.priv.h \
                $(tinfo)/make_keys.c \
-               names.c
+               ./names.c
        $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
 
 make_hash$(BUILD_EXEEXT) : \
@@ -314,7 +314,7 @@ realclean :: distclean
 ../include/hashsize.h \
 ../include/parametrized.h \
 ../include/term.h :
-       cd ../include; $(MAKE) $(CF_MFLAGS)
+       ( cd ../include && $(MAKE) $(TOP_MFLAGS) )
 
 # These rules build test-programs for the modules that have test-drivers
 test_progs : $(TEST_PROGS)
@@ -340,7 +340,7 @@ link_test$x : ./link_test.c $(TEST_DEPS) \
        @ECHO_LD@ $(CC) -o $@ $(CFLAGS_DEFAULT) ../@DFT_OBJ_SUBDIR@/link_test$o $(TEST_LDFLAGS)
 
 ../@DFT_OBJ_SUBDIR@/dump_entry$o:
-       cd ../progs && $(MAKE) ../@DFT_OBJ_SUBDIR@/dump_entry$o
+       ( cd ../progs && $(MAKE) ../@DFT_OBJ_SUBDIR@/dump_entry$o )
 
 report_hashing$x : \
                $(srcdir)/curses.priv.h \

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 2350bbde4df802f58e4da4dfcdab05faff8e026b..b5a73a58f9fed2e3a19b7945ad2915e78feb42aa 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210116) unstable; urgency=low
+ncurses6 (6.2+20210123) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 16 Jan 2021 05:31:57 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Jan 2021 10:02:29 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 2350bbde4df802f58e4da4dfcdab05faff8e026b..b5a73a58f9fed2e3a19b7945ad2915e78feb42aa 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210116) unstable; urgency=low
+ncurses6 (6.2+20210123) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 16 Jan 2021 05:31:57 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Jan 2021 10:02:29 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index f413bc679a5b038c9a6a17e93cd180dd22bb0e8e..f0858f9d303f30f0c2d7eefc2d916045eb826636 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20210116) unstable; urgency=low
+ncurses6 (6.2+20210123) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 16 Jan 2021 05:31:57 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 23 Jan 2021 10:02:29 -0500
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 542a0cef1364bc648166e2bbf2ab004aa4cfe866..99bc096053a3b4076afd00889ed82c2d98e1e48f 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.439 2021/01/16 10:31:57 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.440 2021/01/23 15:02:30 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2021"\r
-!define VERSION_MMDD  "0116"\r
+!define VERSION_MMDD  "0123"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 45d8b6bc33df1e652b3e895863a1af78eee46ab4..fec7f9d168490e05ffb3e1ac11e8188ca914c14f 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2
-Release: 20210116
+Release: 20210123
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index a2ee5190d5e1db6af454852b53e8613cedf9fa71..33bd5639ff58ae53a96d76ded600614f5e11df2a 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
-Release: 20210116
+Release: 20210123
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index b7a5843353ff0e8888e0d5dcd45ecedca5ff83f5..49a95fee2db28884bdeaa357c9192b21f57309ee 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
-Release: 20210116
+Release: 20210123
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/progs/Makefile.in b/progs/Makefile.in
index b1180105d6235bee01f5132fc0e7177bbfa25718..1511ec271210bd394ae17c2bdbbb6bb67039752f 100644 (file)
--- a/progs/Makefile.in
+++ b/progs/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.106 2020/08/29 14:50:45 tom Exp $
+# $Id: Makefile.in,v 1.108 2021/01/23 20:42:08 tom Exp $
 ##############################################################################
-# Copyright 2020 Thomas E. Dickey                                            #
+# Copyright 2020,2021 Thomas E. Dickey                                       #
 # Copyright 1998-2016,2018 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -47,7 +47,7 @@ SHELL         = @SHELL@
 VPATH          = @srcdir@
 THIS           = Makefile
 
-CF_MFLAGS      = @cf_cv_makeflags@
+TOP_MFLAGS     = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)"
 @SET_MAKE@
 
 x              = @EXEEXT@
@@ -203,10 +203,10 @@ install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
 @MAKE_TERMINFO@        $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x     $(DESTDIR)$(bindir)/$(actual_toe)
 @MAKE_TERMINFO@        @echo "linking $(actual_infotocap) to $(actual_tic)"
 @MAKE_TERMINFO@        -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap)
-@MAKE_TERMINFO@        (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap))
+@MAKE_TERMINFO@        ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap) )
 @MAKE_TERMINFO@        @echo "linking $(actual_captoinfo) to $(actual_tic)"
 @MAKE_TERMINFO@        -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo)
-@MAKE_TERMINFO@        (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo))
+@MAKE_TERMINFO@        ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo) )
        $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp)
        $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x   $(DESTDIR)$(bindir)/$(actual_clear)
        $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x    $(DESTDIR)$(bindir)/$(actual_tabs)
@@ -214,7 +214,7 @@ install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir)
        $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x    $(DESTDIR)$(bindir)/$(actual_tset)
        @echo "linking $(actual_reset) to $(actual_tset)"
        -@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-       (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset))
+       ( cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset) )
 
 uninstall.progs:
 @MAKE_TERMINFO@        -@$(LIBTOOL_CLEAN) rm -f $(DESTDIR)$(bindir)/$(actual_tic)
@@ -323,9 +323,9 @@ realclean :: distclean
 ../include/hashsize.h \
 ../include/parametrized.h \
 ../include/term.h :
-       cd ../include; $(MAKE) $(CF_MFLAGS)
+       ( cd ../include && $(MAKE) $(TOP_MFLAGS) )
 $(DEPS_CURSES) :
-       cd ../ncurses; $(MAKE) $(CF_MFLAGS)
+       ( cd ../ncurses && $(MAKE) $(TOP_MFLAGS) )
 
 lint:
 @MAKE_TERMINFO@        $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/tic.c     $(srcdir)/dump_entry.c $(LINT_LIBS)