X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=dist.mk;h=abac3acc44645ec340b91e978b89f3dc88b89c64;hp=d83c4002ecb9c9cb179574ff5c92085c4779ac99;hb=cea2b8032daa63b0f131fd5793de28b2abdf5471;hpb=89407f55b3f245bea3a8884c074940cd325ec3da diff --git a/dist.mk b/dist.mk index d83c4002..abac3acc 100644 --- a/dist.mk +++ b/dist.mk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. # +# Copyright (c) 1998-2015,2016 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.958 2013/11/16 17:39:03 tom Exp $ +# $Id: dist.mk,v 1.1087 2016/01/02 20:24:37 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 = 20131116 +NCURSES_MAJOR = 6 +NCURSES_MINOR = 0 +NCURSES_PATCH = 20160102 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) @@ -53,13 +53,13 @@ DUMP2 = $(DUMP) -nolist # gcc's file is "gnathtml.pl" GNATHTML= gnathtml -# man2html 3.0.1 is a Perl script which assumes that pages are fixed size. +# man2html is a Perl script which assumes that pages are fixed size. # Not all man programs agree with this assumption; some use half-spacing, which # 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' leave no margin (and make it harder to sync with pages). -MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' +MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' -index ALL = ANNOUNCE doc/html/announce.html doc/ncurses-intro.doc doc/hackguide.doc manhtml adahtml @@ -99,7 +99,13 @@ doc/hackguide.doc: doc/html/hackguide.html MANPROG = tbl | nroff -mandoc -rLL=65n -rLT=71n -Tascii manhtml: - @rm -f doc/html/man/*.html + @for f in doc/html/man/*.html; do \ + test -f $$f || continue; \ + case $$f in \ + */index.html) ;; \ + *) rm -f $$f ;; \ + esac; \ + done @mkdir -p doc/html/man @rm -f subst.tmp ; @for f in man/*.[0-9]*; do \ @@ -127,8 +133,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 ;\ - ./edit_man.sh normal editing /usr/man man $$f | $(MANPROG) | tr '\255' '-' | $(MAN2HTML) -title "$$T" | \ - sed -f subst.sed |\ - sed -e 's/"curses.3x.html"/"ncurses.3x.html"/g' \ + ./edit_man.sh normal editing /usr/man man $$f | \ + $(MANPROG) | \ + tr '\255' '-' | \ + $(MAN2HTML) \ + -title "$$T" \ + -aliases man/manhtml.aliases \ + -externs man/manhtml.externs | \ + sed -f subst.sed |\ + sed -e 's/"curses.3x.html"/"ncurses.3x.html"/g' \ >> doc/html/man/$$g ;\ done @rm -f subst.sed