X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=dist.mk;h=8294037e8bfdf3492263d87fb6896523f8c92c54;hp=15b54d4f6bf540ccfeffefb66175ffa8878316ad;hb=6b96eb711cbf58da43002ff14b66d8a52c19a731;hpb=275aeb5889b10a51796b311f3773aeaea4d0a754 diff --git a/dist.mk b/dist.mk index 15b54d4f..8294037e 100644 --- a/dist.mk +++ b/dist.mk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # +# Copyright (c) 1998-2013,2014 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.772 2010/09/04 16:03:54 tom Exp $ +# $Id: dist.mk,v 1.996 2014/07/12 14:47:53 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -36,21 +36,22 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 -NCURSES_MINOR = 7 -NCURSES_PATCH = 20100904 +NCURSES_MINOR = 9 +NCURSES_PATCH = 20140712 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -# The most recent html files were generated with lynx 2.8.6, using ncurses -# configured with +# The most recent html files were generated with lynx 2.8.6 (or later), using +# ncurses configured with # --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 DUMP2 = $(DUMP) -nolist -GNATHTML= `type -p gnathtml || type -p gnathtml.pl` +# gcc's file is "gnathtml.pl" +GNATHTML= gnathtml # man2html 3.0.1 is a Perl script which assumes that pages are fixed size. # Not all man programs agree with this assumption; some use half-spacing, which @@ -98,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 \ @@ -126,7 +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 ;\ 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 @@ -149,7 +162,7 @@ manhtml: # .ali files contain cross referencing information required by gnathtml. adahtml: if [ ! -z "$(GNATHTML)" ]; then \ - (cd ./Ada95/gen ; make html) ;\ + (cd ./Ada95/gen ; make html GNATHTML=$(GNATHTML) ) ;\ fi # This only works on a clean source tree, of course.