X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=dist.mk;h=40f835dff925b4e5aaf425631172f50ae21b6757;hp=6b015317b44ae262333230d0ea1e4b4fd0e8644f;hb=1f474475aab29bc166012819129d46c70320efdc;hpb=c55d387cebf1cee4757ca2c2ef4fbeae59ee4175

diff --git a/dist.mk b/dist.mk
index 6b015317..40f835df 100644
--- a/dist.mk
+++ b/dist.mk
@@ -1,5 +1,6 @@
 ##############################################################################
-# Copyright (c) 1998-2019,2020 Free Software Foundation, Inc.                #
+# 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    #
 # 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.1325 2020/01/18 10:27:03 tom Exp $
+# $Id: dist.mk,v 1.1442 2021/10/18 23:31:58 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -36,12 +37,15 @@ SHELL = /bin/sh
 
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
-NCURSES_MINOR = 1
-NCURSES_PATCH = 20200118
+NCURSES_MINOR = 2
+NCURSES_PATCH = 20211018
 
 # 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
@@ -73,10 +77,13 @@ 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 > $@
@@ -90,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=78n -rLT=78n -Tascii
+MANPROG	= tbl | nroff -mandoc -rHY=0 -rLL=78n -rLT=78n -Tascii
 
 manhtml:
 	@for f in doc/html/man/*.html; do \
@@ -127,7 +134,7 @@ manhtml:
 	   g=$${m}.html ;\
 	   if [ -f doc/html/$$g ]; then chmod +w doc/html/$$g; fi;\
 	   echo "Converting $$m to HTML" ;\
-	   echo '<!-- ' > doc/html/man/$$g ;\
+	   echo '<!--' > doc/html/man/$$g ;\
 	   egrep '^.\\"[^#]' $$f | \
 	   	sed	-e 's/\$$/@/g' \
 			-e 's/^.../  */' \