ncurses 6.2 - patch 20200328

[ncurses.git] / dist.mk

diff --git a/dist.mk b/dist.mk
index 5e2384faca4b7462730533c7f47c949946794ab4..b7e827c57f98f1ff8bd686c5bd79105e64c6799b 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -1,5 +1,6 @@
 ##############################################################################
-# Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                #
+# Copyright 2018-2019,2020 Thomas E. Dickey                                  #
+# Copyright 1998-2017,2018 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"), #
@@ -25,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1117 2016/07/30 13:19:43 tom Exp $
+# $Id: dist.mk,v 1.1343 2020/03/28 10:37:50 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -36,18 +37,21 @@ SHELL = /bin/sh
 
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
-NCURSES_MINOR = 0
-NCURSES_PATCH = 20160730
+NCURSES_MINOR = 2
+NCURSES_PATCH = 20200328
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
+WEBSITE = https://invisible-island.net
+HOMEPAGE = $(WEBSITE)/ncurses
+
 # The most recent html files were generated with lynx 2.8.6 (or later), using
 # ncurses configured with
 #      --without-manpage-renames
 # on Debian/testing.  The -scrollbar and -width options are used to make lynx
 # use 79 columns as it did in 2.8.5 and before.
-DUMP   = lynx -dump -scrollbar=0 -width=79
+DUMP   = lynx -dump -scrollbar=0 -width=79 -display_charset=US-ASCII
 DUMP2  = $(DUMP) -nolist
 
 # gcc's file is "gnathtml.pl"
@@ -73,22 +77,19 @@ distclean:
 
 # Don't mess with announce.html.in unless you have lynx available!
 doc/html/announce.html: announce.html.in
-       sed 's,@VERSION@,$(VERSION),' <announce.html.in > $@
+       sed \
+               -e 's,@VERSION@,$(VERSION),g' \
+               -e 's,@WEBSITE@,$(WEBSITE),g' \
+               -e 's,@HOMEPAGE@,$(HOMEPAGE),g' <announce.html.in > $@
 
 ANNOUNCE : doc/html/announce.html
-       $(DUMP) doc/html/announce.html > $@
+       $(DUMP2) doc/html/announce.html > $@
 
 doc/ncurses-intro.doc: doc/html/ncurses-intro.html
        $(DUMP2) doc/html/ncurses-intro.html > $@
 doc/hackguide.doc: doc/html/hackguide.html
        $(DUMP2) doc/html/hackguide.html > $@
 
-# This is the original command:
-#      MANPROG = tbl | nroff -man
-#
-# This happens to work for groff 1.18.1 on Debian.  At some point groff's
-# maintainer changed the line-length (we do not want/need that here).
-#
 # The distributed html files are formatted using
 #      configure --without-manpage-renames
 #
@@ -96,7 +97,7 @@ doc/hackguide.doc: doc/html/hackguide.html
 # If that conflicts with the --without-manpage-renames, you can install those
 # in a different location using the --with-install-prefix option of the
 # configure script.
-MANPROG        = tbl | nroff -mandoc -rLL=65n -rLT=71n -Tascii
+MANPROG        = tbl | nroff -mandoc -rLL=78n -rLT=78n -Tascii
 
 manhtml:
        @for f in doc/html/man/*.html; do \
@@ -124,7 +125,7 @@ manhtml:
        @echo 's/<\/I>/<\/EM>/g'     >> subst.tmp
        @misc/csort < subst.tmp | uniq > subst.sed
        @echo '/<\/TITLE>/a\' >> subst.sed
-       @echo '<link rev=made href="mailto:bug-ncurses@gnu.org">\' >> subst.sed
+       @echo '<link rel="author" href="mailto:bug-ncurses@gnu.org">\' >> subst.sed
        @echo '<meta http-equiv="Content-Type" content="text\/html; charset=iso-8859-1">' >> subst.sed
        @rm -f subst.tmp
        @for f in man/*.[0-9]* ; do \