nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

hints name change and doc/Makefile

Browse Source 
rename hints/include/multiw-3.370 to hints/include/misc.370

keep the portable nroff options in sys/unix/Makefile.doc,
and relocate the non-portable bits to a variable defined
in sys/unix/hints/include/misc.370

This assumes that the groff options are compatible between
Linux and macOS implementations of groff.

If that turns out not to be the case, this bit:

    ifneq "$(NROFFISGROFF)" ""   # It's groff
    # add the groff-specific plain text flags
    MORE_MAN2TXT_FLAGS += -Tascii -P -cbou
    endif

should relocate from sys/unix/hints/include/misc.370
to sys/unix/hints/linux.370 and sys/unix/hints/macOS.370,
immediately following the inclusion of misc.370, and the
appropriate platform-specific groff options can be
adjused in whichever of those appropriately needs it.

Closes #1153
This commit is contained in:
nhmall
2023-11-27 17:44:02 -05:00
parent febda956ee
commit 2873706c84
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/Makefile.doc
+2 -1
View File
@@ -115,7 +115,8 @@ Guidebook.dat : Gbk-1pg-pfx.mn Gbk-1pg-sfx.mn $(GUIDEBOOK_MN) tmac.n tmac.nh \
$(ONEPAGECMD) > $@ $(ONEPAGECMD) > $@
# plain text output # 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 nethack.txt : nethack.6
cat nethack.6 | $(MAN2TXT) > nethack.txt cat nethack.6 | $(MAN2TXT) > nethack.txt
recover.txt : recover.6 recover.txt : recover.6
sys/unix/hints/include/multiw-3.370 → sys/unix/hints/include/misc.370
+13 -6
View File
@@ -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: # Included from:
# hints/linux.370 # hints/linux.370
@@ -66,17 +66,24 @@ endif
endif endif
#detection of groff #detection of groff
#NROFFISGROFF := $(shell echo `nroff --version | grep "GNU groff version"`) NROFFISGROFF := $(shell echo `nroff --version | grep "GNU groff version"`)
#$(info NROFFISGROFF=$(NROFFISGROFF)) #$(info NROFFISGROFF=$(NROFFISGROFF))
#ifneq "$(NROFFISGROFF)" "" ifneq "$(NROFFISGROFF)" ""
# --- version check is not currently needed ---
# get the version of groff # get the version of groff
#GROFFGE123 := $(shell expr `echo $(NROFFISGROFF) | cut -f2 -d.` \>= 23) #GROFFGE123 := $(shell expr `echo $(NROFFISGROFF) | cut -f2 -d.` \>= 23)
#$(info GROFFGE123=$(GROFFGE123)) #$(info GROFFGE123=$(GROFFGE123))
#ifeq "$(GROFFGE123)" "1" #ifeq "$(GROFFGE123)" "1"
#NROFF_FLAGS = -W font #NROFF_FLAGS = -W font
#endif #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
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
sys/unix/hints/linux.370
+3 -3
View File
@@ -29,7 +29,7 @@ PRECHECK+=checkmakefiles
# in HINTSINCLNAMES (without suffix and without a path) # in HINTSINCLNAMES (without suffix and without a path)
HINTSINCLNAMES := compiler cross-pre cross-post \ HINTSINCLNAMES := compiler cross-pre cross-post \
gbdates-pre gbdates-post \ gbdates-pre gbdates-post \
multiw-1 multiw-2 multiw-3 \ multiw-1 multiw-2 misc \
multisnd1-pre multisnd2-pre multisnd-post multisnd1-pre multisnd2-pre multisnd-post
HINTSINCLFILES := $(addsuffix .$(HINTSVERSION), $(HINTSINCLNAMES)) HINTSINCLFILES := $(addsuffix .$(HINTSVERSION), $(HINTSINCLNAMES))
endif endif
@@ -65,10 +65,10 @@ QTDIR=/usr/local/qt6
endif # WANT_WIN_QT6 endif # WANT_WIN_QT6
endif # WANT_WIN_QT endif # WANT_WIN_QT
# multiw-3.370 must come after compiler.370 # misc.370 must come after compiler.370
# and after QTDIR is defined. # and after QTDIR is defined.
# #
#-INCLUDE multiw-3.370 #-INCLUDE misc.370
ifeq "$(USE_ASAN)" "1" ifeq "$(USE_ASAN)" "1"
CFLAGS+=-fsanitize=address CFLAGS+=-fsanitize=address
sys/unix/hints/macOS.370
+3 -3
View File
@@ -29,7 +29,7 @@ PRECHECK+=checkmakefiles
# in HINTSINCLNAMES (without suffix and without a path) # in HINTSINCLNAMES (without suffix and without a path)
HINTSINCLNAMES := compiler cross-pre cross-post \ HINTSINCLNAMES := compiler cross-pre cross-post \
gbdates-pre gbdates-post \ gbdates-pre gbdates-post \
multiw-1 multiw-2 multiw-3 \ multiw-1 multiw-2 misc \
multisnd1-pre multisnd2-pre multisnd-post multisnd1-pre multisnd2-pre multisnd-post
HINTSINCLFILES := $(addsuffix .$(HINTSVERSION), $(HINTSINCLNAMES)) HINTSINCLFILES := $(addsuffix .$(HINTSVERSION), $(HINTSINCLNAMES))
endif endif
@@ -83,10 +83,10 @@ endif # HAVE_MACPORTS
endif # QTDIR endif # QTDIR
endif # WANT_WIN_QT endif # WANT_WIN_QT
# multiw-3.370 must come after compiler.370 # misc.370 must come after compiler.370
# and after QTDIR is defined # and after QTDIR is defined
#-INCLUDE multiw-3.370 #-INCLUDE misc.370
ifeq "$(USE_ASAN)" "1" ifeq "$(USE_ASAN)" "1"
CFLAGS +=-fsanitize=address CFLAGS +=-fsanitize=address