ncurses 6.4 - patch 20240420

[ncurses.git] / mk-1st.awk

diff --git a/mk-1st.awk b/mk-1st.awk
index 75811d4555fc6bae0ef03519e5d5d87207cbd76d..6a5eafab26cfa8f5f52375aff1e3b762c2ab4d45 100644 (file)
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,6 +1,6 @@
-# $Id: mk-1st.awk,v 1.123 2021/08/15 20:01:44 tom Exp $
+# $Id: mk-1st.awk,v 1.125 2023/04/22 15:49:59 tom Exp $
 ##############################################################################
-# Copyright 2018-2020,2021 Thomas E. Dickey                                  #
+# Copyright 2018-2021,2023 Thomas E. Dickey                                  #
 # Copyright 1998-2016,2017 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
@@ -354,8 +354,7 @@ BEGIN       {
                 && ( $1 != "link_test" ) \
                 && ( $2 == "lib" \
                   || $2 == "progs" \
-                  || $2 == "c++" \
-                  || $2 == "tack" ))
+                  || $2 == "c++" ))
                {
                        if ( found == 0 )
                        {
@@ -477,10 +476,6 @@ END        {
                        {
                                end_name = lib_name;
                                use_name = trim_suffix(TermlibRoot) USE_LIB_SUFFIX
-                               printf "# FIXME\n";
-                               printf "# name '%s'\n", name;
-                               printf "# end_name '%s'\n", end_name;
-                               printf "# use_name '%s'\n", use_name;
                                printf "../lib/%s : \\\n", lib_name
                                if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
                                        printf "\t\t../lib/lib%s.la \\\n", use_name;
@@ -511,8 +506,10 @@ END        {
                                printf "\t\t$(DESTDIR)$(libdir) \\\n";
                                use_name = TermlibRoot USE_LIB_SUFFIX
                                if ( (name != use_name ) && ( index(name, "++") == 0 ) && ( index(name, "tic") == 1 || index(name, "ncurses") == 1 ) ) {
-                                       printf "\t\tinstall.%s \\\n", trim_suffix(TermlibRoot);
-                                       if ( index(name, "tic") == 1 && index(TermlibRoot, "ncurses") != 1 ) {
+                                       if ( trim_suffix(TermlibRoot) != trim_suffix(name) ) {
+                                               printf "\t\tinstall.%s \\\n", trim_suffix(TermlibRoot);
+                                       }
+                                       if ( index(name, "tic") == 1 && index(TermlibRoot, "ncurses") != 1 && trim_suffix(name) != "ncurses" ) {
                                                printf "\t\tinstall.%s \\\n", "ncurses";
                                        }
                                }