From: nhmall <nhmall@nethack.org>
Date: Wed, 15 Jun 2022 23:07:28 +0000 (-0400)
Subject: another macOS.370 hint tweak
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c9fa6d9d66636be1b5182caf98211ca273f3c62;p=nethack

another macOS.370 hint tweak
---

diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370
index 4308fc315..a3ec3a629 100755
--- a/sys/unix/hints/macOS.370
+++ b/sys/unix/hints/macOS.370
@@ -140,6 +140,9 @@ ifeq "$(CURSES_UNICODE)" "sys"
 NHCFLAGS+=-DCURSES_UNICODE
 WINLIB += $(CURSESLIB)
 else
+ifeq "$(CURSES_UNICODE)" "0"
+WINLIB += $(CURSESLIB)
+else
 ifeq "$(USE_CURSESLIB)" "1"
 NHCFLAGS+=-DCURSES_UNICODE
 else
@@ -153,16 +156,13 @@ HAVE_NCURSESW=1
 else
 HAVE_NCURSESW=0
 endif
-ifneq "$(CURSES_UNICODE)" "0"
 ifeq "$(HAVE_NCURSESW)" "1"
 CURSESLIB = $(NCURSES_LFLAGS)
 NHCFLAGS+=-DCURSES_UNICODE
 else
 $(info Attention: CURSES_UNICODE is not being defined without ncursesw)
 endif   #HAVE_NCURSESW
-endif   #not CURSES_UNICODE=0
 endif   #USE_CURSESLIB
-ifneq "$(CURSES_UNICODE)" "0"
 ifdef CURSESLIB
 PKGCFLAGS=
 ifeq "$(HAVE_HOMEBREW)" "1"
@@ -189,12 +189,11 @@ LFLAGS += $(HOMEBREW_LFLAGS) $(MACPORTS_LFLAGS)
 WINLIB += $(HOMEBREW_WINLIB) $(MACPORTS_WINLIB) $(CURSESLIB)
 PKGCFLAGS += $(HOMEBREW_CFLAGS) $(MACPORTS_CFLAGS)
 endif   #CURSESLIB
-else    # CURSES_UNICODE
 WINLIB += $(CURSESLIB)
 $(info WINLIB=$(WINLIB))
 $(info CURSESLIB=$(CURSESLIB))
-endif   #not CURSES_UNICODE=0
-endif   #not CURSES_UNIODE=sys
+endif   #CURSES_UNICODE=0
+endif   #CURSES_UNIODE=sys
 endif   #MAKEFILE_SRC
 
 CFLAGS+= $(PKGCFLAGS) $(WINCFLAGS)  #WINCFLAGS set from multiw-2.370