X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=dist.mk;h=9d7ef8865c833164a6537fc6c8cffbd0cc5b6046;hp=2651e2bb1f9b7c0d7cf963a4fd01d2890a382419;hb=55ccd2b959766810cf7db8d1c4462f338ce0afc8;hpb=a8987e73ec254703634802b4f7ee30d3a485524d

diff --git a/dist.mk b/dist.mk
index 2651e2bb..9d7ef886 100644
--- a/dist.mk
+++ b/dist.mk
@@ -1,4 +1,4 @@
-# $Id: dist.mk,v 1.402 2004/02/08 20:56:43 tom Exp $
+# $Id: dist.mk,v 1.498 2005/10/09 14:41:57 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -9,12 +9,15 @@ SHELL = /bin/sh
 
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
-NCURSES_MINOR = 4
-NCURSES_PATCH = 20040208
+NCURSES_MINOR = 5
+NCURSES_PATCH = 20051010
 
 # 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.5, configured with
+#	--without-manpage-renames
+# on Debian/testing.
 DUMP	= lynx -dump
 DUMP2	= $(DUMP) -nolist
 
@@ -37,7 +40,7 @@ dist:	$(ALL)
 	(cd ..;  tar cvf ncurses-$(VERSION).tar `sed <ncurses-$(VERSION)/MANIFEST 's/^./ncurses-$(VERSION)/'`;  gzip ncurses-$(VERSION).tar)
 
 distclean:
-	rm -f $(ALL) subst.tmp subst.sed MANIFEST.tmp
+	rm -f $(ALL) subst.tmp subst.sed
 
 # Don't mess with announce.html.in unless you have lynx available!
 doc/html/announce.html: announce.html.in
@@ -51,9 +54,17 @@ doc/ncurses-intro.doc: doc/html/ncurses-intro.html
 doc/hackguide.doc: doc/html/hackguide.html
 	$(DUMP2) doc/html/hackguide.html > $@
 
-MANPROG	= tbl | nroff -man
+# 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
+MANPROG	= tbl | nroff -mandoc -rLL=65n -rLT=71n -Tascii
 
-manhtml: MANIFEST
+manhtml:
 	@rm -f doc/html/man/*.html
 	@mkdir -p doc/html/man
 	@rm -f subst.tmp ;
@@ -90,42 +101,23 @@ manhtml: MANIFEST
 			-e 's/>/\&gt;/g' \
 	   >> doc/html/man/$$g ;\
 	   echo '-->' >> doc/html/man/$$g ;\
-	   man/edit_man.sh normal editing /usr/man man $$f | $(MANPROG) | tr '\255' '-' | $(MAN2HTML) -title "$$T" | \
+	   ./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' \
 	   >> doc/html/man/$$g ;\
 	done
 	@rm -f subst.sed
-	@sed -e "\%./doc/html/man/%d" < MANIFEST > MANIFEST.tmp
-	@find ./doc/html/man -type f -print >> MANIFEST.tmp
-	@chmod u+w MANIFEST
-	@misc/csort -u < MANIFEST.tmp > MANIFEST
-	@rm -f MANIFEST.tmp
 
 #
 # Please note that this target can only be properly built if the build of the
 # Ada95 subdir has been done.  The reason is, that the gnathtml tool uses the
 # .ali files generated by the Ada95 compiler during the build process.  These
 # .ali files contain cross referencing information required by gnathtml.
-adahtml: MANIFEST
+adahtml:
 	if [ ! -z "$(GNATHTML)" ]; then \
 	  (cd ./Ada95/gen ; make html) ;\
-	  sed -e "\%./doc/html/ada/%d" < MANIFEST > MANIFEST.tmp ;\
-	  find ./doc/html/ada -type f -print >> MANIFEST.tmp ;\
-	  misc/csort -u < MANIFEST.tmp > MANIFEST ;\
-	  rm -f MANIFEST.tmp ;\
 	fi
 
-# Prepare distribution for version control
-vcprepare:
-	find . -type d -exec mkdir {}/RCS \;
-
-# Write-lock almost all files not under version control.
-ADA_EXCEPTIONS=$(shell eval 'a="\\\\\|";for x in Ada95/gen/terminal*.m4; do echo -n $${a}Ada95/ada_include/`basename $${x} .m4`; done')
-EXCEPTIONS = 'announce.html$\\|ANNOUNCE\\|misc/.*\\.doc\\|man/terminfo.5\\|lib_gen.c'$(ADA_EXCEPTIONS)
-writelock:
-	for x in `grep -v $(EXCEPTIONS) MANIFEST`; do if [ ! -f `dirname $$x`/RCS/`basename $$x`,v ]; then chmod a-w $${x}; fi; done
-
 # This only works on a clean source tree, of course.
 MANIFEST:
 	-rm -f $@