diff --git a/sys/unix/Makefile.doc b/sys/unix/Makefile.doc index e91c3b2c4..5ea70b434 100644 --- a/sys/unix/Makefile.doc +++ b/sys/unix/Makefile.doc @@ -115,7 +115,8 @@ Guidebook.dat : Gbk-1pg-pfx.mn Gbk-1pg-sfx.mn $(GUIDEBOOK_MN) tmac.n tmac.nh \ $(ONEPAGECMD) > $@ # plain text output -MAN2TXT = $(NHGREP) | nroff -man -c -Tascii - | $(COLCMD) +#MAN2TXT = $(NHGREP) | nroff -man $(MORE_MAN2TXT_FLAGS) - | $(COLCMD) +MAN2TXT = $(NHGREP) | nroff -man $(MORE_MAN2TXT_FLAGS) - nethack.txt : nethack.6 cat nethack.6 | $(MAN2TXT) > nethack.txt recover.txt : recover.6 diff --git a/sys/unix/hints/include/multiw-3.370 b/sys/unix/hints/include/misc.370 similarity index 77% rename from sys/unix/hints/include/multiw-3.370 rename to sys/unix/hints/include/misc.370 index 96d032218..1ae78e908 100644 --- a/sys/unix/hints/include/multiw-3.370 +++ b/sys/unix/hints/include/misc.370 @@ -1,7 +1,7 @@ #------------------------------------------------------------------------------ -# NetHack 3.7 multiw-3.370 $NHDT-Date: 1668359836 2022/11/13 17:17:16 $ $NHDT-Branch: NetHack-3.7 $ +# NetHack 3.7 misc.370 $NHDT-Date: 1668359836 2022/11/13 17:17:16 $ $NHDT-Branch: NetHack-3.7 $ # -# Further set-up for multiple window ports (interfaces) that comes after compiler.370. +# Further set-up for miscellaneou odds and ends (after compiler.370) # # Included from: # hints/linux.370 @@ -66,17 +66,24 @@ endif endif #detection of groff -#NROFFISGROFF := $(shell echo `nroff --version | grep "GNU groff version"`) +NROFFISGROFF := $(shell echo `nroff --version | grep "GNU groff version"`) #$(info NROFFISGROFF=$(NROFFISGROFF)) -#ifneq "$(NROFFISGROFF)" "" +ifneq "$(NROFFISGROFF)" "" +# --- version check is not currently needed --- # get the version of groff #GROFFGE123 := $(shell expr `echo $(NROFFISGROFF) | cut -f2 -d.` \>= 23) #$(info GROFFGE123=$(GROFFGE123)) #ifeq "$(GROFFGE123)" "1" #NROFF_FLAGS = -W font #endif -#endif # NROFFISGROFF +# --- +endif # NROFFISGROFF -#end of hints/include/multiw-3.370 +ifneq "$(NROFFISGROFF)" "" # It's groff +# add the groff-specific plain text flags +MORE_MAN2TXT_FLAGS += -Tascii -P -cbou +endif + +#end of hints/include/misc.370 #------------------------------------------------------------------------------ diff --git a/sys/unix/hints/linux.370 b/sys/unix/hints/linux.370 index c90507af9..02ba95a77 100755 --- a/sys/unix/hints/linux.370 +++ b/sys/unix/hints/linux.370 @@ -29,7 +29,7 @@ PRECHECK+=checkmakefiles # in HINTSINCLNAMES (without suffix and without a path) HINTSINCLNAMES := compiler cross-pre cross-post \ gbdates-pre gbdates-post \ - multiw-1 multiw-2 multiw-3 \ + multiw-1 multiw-2 misc \ multisnd1-pre multisnd2-pre multisnd-post HINTSINCLFILES := $(addsuffix .$(HINTSVERSION), $(HINTSINCLNAMES)) endif @@ -65,10 +65,10 @@ QTDIR=/usr/local/qt6 endif # WANT_WIN_QT6 endif # WANT_WIN_QT -# multiw-3.370 must come after compiler.370 +# misc.370 must come after compiler.370 # and after QTDIR is defined. # -#-INCLUDE multiw-3.370 +#-INCLUDE misc.370 ifeq "$(USE_ASAN)" "1" CFLAGS+=-fsanitize=address diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370 index a95a87400..a0266938e 100755 --- a/sys/unix/hints/macOS.370 +++ b/sys/unix/hints/macOS.370 @@ -29,7 +29,7 @@ PRECHECK+=checkmakefiles # in HINTSINCLNAMES (without suffix and without a path) HINTSINCLNAMES := compiler cross-pre cross-post \ gbdates-pre gbdates-post \ - multiw-1 multiw-2 multiw-3 \ + multiw-1 multiw-2 misc \ multisnd1-pre multisnd2-pre multisnd-post HINTSINCLFILES := $(addsuffix .$(HINTSVERSION), $(HINTSINCLNAMES)) endif @@ -83,10 +83,10 @@ endif # HAVE_MACPORTS endif # QTDIR endif # WANT_WIN_QT -# multiw-3.370 must come after compiler.370 +# misc.370 must come after compiler.370 # and after QTDIR is defined -#-INCLUDE multiw-3.370 +#-INCLUDE misc.370 ifeq "$(USE_ASAN)" "1" CFLAGS +=-fsanitize=address