ncurses 6.1 - patch 20180825

[ncurses.git] / dist.mk

diff --git a/dist.mk b/dist.mk
index 7df027abe019f94e409ac7d8ce7be5c692840b45..1f4d548aa20113a77d2d11e4b1acbffce12615fb 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -1,5 +1,5 @@
 ##############################################################################
 ##############################################################################

-# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
+# Copyright (c) 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"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1150 2017/02/26 16:41:23 tom Exp $
+# $Id: dist.mk,v 1.1238 2018/08/25 15:59:35 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -36,8 +36,8 @@ SHELL = /bin/sh
 
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6

-NCURSES_MINOR = 0
-NCURSES_PATCH = 20170304
+NCURSES_MINOR = 1
+NCURSES_PATCH = 20180825

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)


@@ -47,7 +47,7 @@ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 #      --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.
 #      --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"
 DUMP2  = $(DUMP) -nolist
 
 # gcc's file is "gnathtml.pl"


@@ -83,12 +83,6 @@ doc/ncurses-intro.doc: doc/html/ncurses-intro.html
 doc/hackguide.doc: doc/html/hackguide.html
        $(DUMP2) doc/html/hackguide.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
 #
 # The distributed html files are formatted using
 #      configure --without-manpage-renames
 #


@@ -96,7 +90,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.
 # 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 \
 
 manhtml:
        @for f in doc/html/man/*.html; do \