first conditionalized docs (TRUNK ONLY)

plus various related missing bits and tids

diff --git a/doc/dlb.6 b/doc/dlb.6
index eb018b291d07d8183736af55c1c63a2a9cbb7f73..26a41f867e23985f5149f9fb77266f4db8c530a8 100644 (file)
--- a/doc/dlb.6
+++ b/doc/dlb.6
@@ -24,8 +24,18 @@ read-only information.  Note that like tar the command and option
 specifiers are specified as a continuous string and are followed
 by any arguments required in the same order as the option specifiers.
 .PP
+^?ALLDOCS
 This facility is optional and may be excluded during NetHack
 configuration.
+^:
+^?DLB
+This facility is optional but is included in this NetHack
+configuration.
+^:
+This facility is optional and was excluded from this NetHack
+configuration.
+^.
+^.
 .SH COMMANDS
 The
 .B x

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 9b6e034b4296cb2244a84d10a7efef49088fb0b4..825b60573b2cb1518c0dfa406f8efe2d9b471d32 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -438,3 +438,4 @@ new oextra structure housing pointers to oname, omonst, omid, olong, and omailcm
 drawing symbols for DECGraphics, IBMGraphics, MACgraphics are now stored in an
        external symbol file that can be changed without rebuilding
 new hints-based configuration system
+allow documentation to be specialized to the options in the game binary

diff --git a/doc/recover.6 b/doc/recover.6
index d813264d18ad1ae7f1cf0b12b43d8175d4dc4ed0..546da5ee5d897bde47d37111359913bc6ad48224 100644 (file)
--- a/doc/recover.6
+++ b/doc/recover.6
@@ -33,11 +33,26 @@ It overrides the value from NETHACKDIR, HACKDIR, or the directory
 specified by the game administrator during compilation
 (usually /usr/games/lib/nethackdir).
 .PP
+^?ALLDOCS
 For recovery to be possible,
 .I nethack
 must have been compiled with the INSURANCE option, and the run-time option
 .I checkpoint
 must also have been on.
+^:
+^?INSURANCE
+For recovery to be possible,
+.I nethack
+must have been compiled with the INSURANCE option (this configuration was),
+and the run-time option
+.I checkpoint
+must also have been on.
+^:
+This configuration of
+.I nethack
+was created without support for recovery.
+^.
+^.
 NetHack normally writes out files for levels as the player leaves them,
 so they will be ready for return visits.
 When checkpointing, NetHack also writes out the level entered and

diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
index c62dd5bd6987d0ef8b29e0292c7abac766175562..d2fbd77262cfe792708c5d6fa175660e1a36ee39 100644 (file)
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
@@ -174,7 +174,7 @@ YACCDIST =
 
 #      dependencies for makedefs
 #
-makedefs:      $(MAKEOBJS) mdgrep.h
+makedefs:      $(MAKEOBJS) #mdgrep.h
        $(CC) $(LFLAGS) -o makedefs $(MAKEOBJS)
 
 makedefs.o: makedefs.c $(CONFIG_H) ../include/permonst.h \
@@ -183,9 +183,9 @@ makedefs.o: makedefs.c $(CONFIG_H) ../include/permonst.h \
                ../include/monst.h ../include/you.h ../include/flag.h \
                ../include/dlb.h ../include/patchlevel.h ../include/qtext.h
 
-# Don't require perl to build, but document how to get a new mdgrep.h.
-#mdgrep.h: mdgrep.pl
-#      perl mdgrep.pl
+# Don't require perl to build; that is why mdgrep.h is commented out above.
+mdgrep.h: mdgrep.pl
+       perl mdgrep.pl
 
 ../include/onames.h: makedefs
        ./makedefs -o

diff --git a/sys/unix/hints/linux b/sys/unix/hints/linux
index 099c3d662f7adf9553fad07e43a2d96ec997ec00..bdd8169a5d5f97d7d627624353b3acaf80c885f4 100644 (file)
--- a/sys/unix/hints/linux
+++ b/sys/unix/hints/linux
@@ -13,7 +13,7 @@ SHELLDIR = $(PREFIX)/games
 #PREFIX=/usr
 PREFIX=$(wildcard ~)/nh/install
 
-CFLAGS=-O -I../include -DNOTPARMDECL $(CFLAGS1)
+CFLAGS=-O -I../include -DNOTPARMDECL $(CFLAGS1) -DDLB
 CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
 
 LINK=$(CC)

diff --git a/sys/unix/hints/macosx b/sys/unix/hints/macosx
index 594c6f8d29f87564ee816559313277bb53ac96d1..de2594c00ac343a387f73b84f1ce04dd143e9465 100644 (file)
--- a/sys/unix/hints/macosx
+++ b/sys/unix/hints/macosx
@@ -54,7 +54,7 @@ CC=gcc -Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -W
 # XXX -g vs -O should go here, -I../include goes in the makefile
 CFLAGS=-g -I../include
 CFLAGS+=-DNOCLIPPING -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\"
-CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\"
+CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB
 
 ifdef WANT_WIN_TTY
 WINSRC = $(WINTTYSRC)

diff --git a/sys/unix/hints/macosx10.5 b/sys/unix/hints/macosx10.5
index 626421d89ac5679e3f6594700535ce48266cf174..e0225f3c571d105690e8c5ced7a1df8806b1f527 100644 (file)
--- a/sys/unix/hints/macosx10.5
+++ b/sys/unix/hints/macosx10.5
@@ -59,7 +59,7 @@ CC=gcc -Wall -Wextra -Wno-missing-field-initializers -Wimplicit -Wreturn-type -W
 # XXX -g vs -O should go here, -I../include goes in the makefile
 CFLAGS=-g -I../include
 CFLAGS+=-DNOCLIPPING -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\"
-CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\"
+CFLAGS+= -DDEFAULT_WINDOW_SYS=\"$(WANT_DEFAULT)\" -DDLB
 
 ifdef WANT_WIN_TTY
 WINSRC = $(WINTTYSRC)

diff --git a/util/mdgrep.pl b/util/mdgrep.pl
index b0f465eddb3a4155740b95930a70e3f2afa3c24f..138d49a745fe006846ea99e9daa4d6d1395ff5db 100644 (file)
--- a/util/mdgrep.pl
+++ b/util/mdgrep.pl
@@ -1,5 +1,5 @@
 #!perl
-# NetHack 3.5  makedefs.c  $Date$  $Revision$
+# NetHack 3.5  mdgrep.pl  $Date$  $Revision$
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2008
 # NetHack may be freely redistributed.  See license for details.
 
@@ -21,7 +21,7 @@
        COMPRESS ZLIB_COMP RANDOM SECURE USER_SOUNDS WIZARD
        SAFERHANGUP MFLOPPY NOCWD_ASSUMPTIONS
        VAR_PLAYGROUND DLB SHELL SUSPEND NOSAVEONHANGUP HANGUPHANDLING
-       BSD_JOB_CONTROL MAIL POSIX_JOB_CONTROL
+       BSD_JOB_CONTROL MAIL POSIX_JOB_CONTROL INSURANCE
        UNICODE_DRAWING UNICODE_WIDEWINPORT UNICODE_PLAYERTEXT
 /;