X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=dist.mk;h=e220a6199c1e5eb9ce7b719cd85894adaada993a;hp=aefa45e9a4fca236aae5399d67b1ac0a8941f5ef;hb=8c0ecb76c78517e32c606dadf87b5f31f24b78fe;hpb=76af49c338ca828b39306fcf93c6d49dfaf11dfc;ds=sidebyside

diff --git a/dist.mk b/dist.mk
index aefa45e9..e220a619 100644
--- a/dist.mk
+++ b/dist.mk
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2009,2010 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.663 2008/09/27 12:10:38 tom Exp $
+# $Id: dist.mk,v 1.750 2010/03/13 18:24:27 tom Exp $
 # 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 = 5
-NCURSES_MINOR = 6
-NCURSES_PATCH = 20080927
+NCURSES_MINOR = 7
+NCURSES_PATCH = 20100313
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -57,8 +57,7 @@ GNATHTML= `type -p gnathtml || type -p gnathtml.pl`
 # has the effect of lengthening the text portion of the page -- so man2html
 # would remove some text.  The man program on Redhat 6.1 appears to work with
 # man2html if we set the top/bottom margins to 6 (the default is 7).  Newer
-# versions of 'man' on Linux leave no margin (and make it harder to sync with
-# pages).
+# versions of 'man' leave no margin (and make it harder to sync with pages).
 MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html'
 
 ALL	= ANNOUNCE doc/html/announce.html doc/ncurses-intro.doc doc/hackguide.doc manhtml adahtml
@@ -91,6 +90,11 @@ doc/hackguide.doc: doc/html/hackguide.html
 #
 # The distributed html files are formatted using
 #	configure --without-manpage-renames
+#
+# The edit_man.sed script is built as a side-effect of installing the manpages.
+# 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
 
 manhtml: