ncurses 6.2 - patch 20210828

[ncurses.git] / mk-hdr.awk

diff --git a/mk-hdr.awk b/mk-hdr.awk
index c5309a76f9b1ae9ac89743c9e07160f354589cbb..7608afedb01e877e078e183a2cb3c9447a058edf 100644 (file)
--- a/mk-hdr.awk
+++ b/mk-hdr.awk
@@ -1,6 +1,7 @@
-# $Id: mk-hdr.awk,v 1.1 2007/01/13 19:44:22 tom Exp $
+# $Id: mk-hdr.awk,v 1.8 2021/06/17 21:20:30 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
+# Copyright 2020,2021 Thomas E. Dickey                                       #
+# Copyright 2007-2010,2013 Free Software Foundation, Inc.                    #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -38,6 +39,13 @@ function basename(path) {
        sub(/^.*\//,"",path)
        return path;
 }
+function in_subset(value) {
+       value = " " value " ";
+       check = subset;
+       gsub("[+]", " ", check);
+       check = " " check " ";
+       return index(check,value);
+}
 BEGIN  {
                found = 0
                using = 1
@@ -47,7 +55,7 @@ BEGIN {
                using = 0
                if (subset == "none") {
                        using = 1
-               } else if (index(subset,$2) > 0) {
+               } else if (in_subset($2) > 0) {
                        using = 1
                } else {
                        using = 0
@@ -61,8 +69,8 @@ BEGIN {
                        if (found == 0) {
                                print  ""
                                print  "# generated by mk-hdr.awk"
-                               printf "#  subset:     %s\n", subset 
-                               printf "#  compat:     %s\n", compat 
+                               printf "#  subset:     %s\n", subset
+                               printf "#  compat:     %s\n", compat
                                print  ""
                                found = 1
                        }
@@ -73,12 +81,12 @@ BEGIN       {
 END    {
                if ( count > 0 )
                {
-                       print "${DESTDIR}${includedir} :"
-                       print " sh ${srcdir}/../mkinstalldirs $@"
+                       print "${INCLUDEDIR} :"
+                       print " mkdir -p $@"
                        print ""
                        print "install \\"
                        print "install.libs \\"
-                       print "install.includes :: ${AUTO_SRC} ${DESTDIR}${includedir} \\"
+                       print "install.includes :: ${AUTO_SRC} ${INCLUDEDIR} \\"
 
                        for (i = 0; i < count - 1; ++i) {
                                printf "                %s \\\n", data[i]
@@ -86,9 +94,9 @@ END   {
                        printf "                %s\n", data[count - 1]
 
                        for (i = 0; i < count; ++i) {
-                               printf "        @ (cd ${DESTDIR}${includedir} && rm -f %s) ; ../headers.sh ${INSTALL_DATA} ${DESTDIR}${includedir} ${srcdir} %s\n", basename(data[i]), data[i]
+                               printf "        @ (cd ${INCLUDEDIR} && rm -f %s) ; ../headers.sh ${INSTALL_DATA} ${INCLUDEDIR} ${srcdir} %s\n", basename(data[i]), data[i]
                                if (data[i] == "curses.h" && compat == "yes") {
-                                       printf "        @ (cd ${DESTDIR}${includedir} && rm -f ncurses.h && ${LN_S} %s ncurses.h)\n", data[i]
+                                       printf "        @ (cd ${INCLUDEDIR} && rm -f ncurses.h && ${LN_S} %s ncurses.h)\n", data[i]
                                }
                        }
                        print ""
@@ -97,9 +105,9 @@ END  {
                        print "uninstall.includes ::"
 
                        for (i = 0; i < count; ++i) {
-                               printf "        -@ (cd ${DESTDIR}${includedir} && rm -f %s)\n", basename(data[i])
+                               printf "        -@ (cd ${INCLUDEDIR} && rm -f %s)\n", basename(data[i])
                                if (data[i] == "curses.h" && compat == "yes") {
-                                       printf "        -@ (cd ${DESTDIR}${includedir} && rm -f ncurses.h)\n"
+                                       printf "        -@ (cd ${INCLUDEDIR} && rm -f ncurses.h)\n"
                                }
                        }
                }