X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=dist.mk;h=6ff73c12174f5df2020f08ef8dc12f535d3465fc;hb=8b6693ef8fb9e7bafb52d7c42fc3d15b7a1bea3f;hp=dc31823e75694256d018bdee2b7e2d109c67a1d7;hpb=aabb3a65ee5d88949abe529b5131adedb9cfab84;p=ncurses.git
diff --git a/dist.mk b/dist.mk
index dc31823e..f8aa0543 100644
--- a/dist.mk
+++ b/dist.mk
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 1998-2014,2015 Free Software Foundation, Inc. #
+# Copyright (c) 1998-2018,2019 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 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.1052 2015/05/17 16:37:10 tom Exp $
+# $Id: dist.mk,v 1.1279 2019/04/20 15:00:19 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
@@ -35,9 +35,9 @@
SHELL = /bin/sh
# These define the major/minor/patch versions of ncurses.
-NCURSES_MAJOR = 5
-NCURSES_MINOR = 9
-NCURSES_PATCH = 20150523
+NCURSES_MAJOR = 6
+NCURSES_MINOR = 1
+NCURSES_PATCH = 20190420
# 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.
-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"
@@ -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 > $@
-# 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 +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.
-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 +118,7 @@ manhtml:
@echo 's/<\/I>/<\/EM>/g' >> subst.tmp
@misc/csort < subst.tmp | uniq > subst.sed
@echo '/<\/TITLE>/a\' >> subst.sed
- @echo '\' >> subst.sed
+ @echo '\' >> subst.sed
@echo '' >> subst.sed
@rm -f subst.tmp
@for f in man/*.[0-9]* ; do \