From: nhmall <nhmall@nethack.org>
Date: Fri, 24 Jan 2020 22:27:48 +0000 (-0500)
Subject: Merge branch 'NetHack-3.7' into NetHack-3.7-Jan2020
X-Git-Tag: NetHack-3.7.0_WIP~5^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97b74e6f7b1423df88b075c34abba461c1763488;p=nethack

Merge branch 'NetHack-3.7' into NetHack-3.7-Jan2020
---

97b74e6f7b1423df88b075c34abba461c1763488
diff --cc doc/makedefs.txt
index 97a1f0ac7,08ca2c9ef..8d6c85bc1
--- a/doc/makedefs.txt
+++ b/doc/makedefs.txt
@@@ -30,20 -30,16 +30,20 @@@ SHORT COMMAND
                through the same logic as that used by the --grep  command;  see
                the MDGREP FUNCTIONS section below for details.
  
-        -m     Generate monster.c.
- 
-        -v     Generate  date.h and options file. It will read dat/gitinfo.txt,
 -       -m     Generate  date.h and options file. It will read dat/gitinfo.txt,
++       -c     Generate  date.h and options file. It will read dat/gitinfo.txt,
++              only if it is present, to obtain githash= and gitbranch=
++               info and include related preprocessor #defines in date.h file.
                only if it is present, to obtain githash= and gitbranch=
                 info and include related preprocessor #defines in date.h file.
  
         -p     Generate pm.h
  
-        -q     Generate quest.dat.
- 
 -       -q     Generate the rumors file.
 +       -r     Generate the rumors file.
 +
 +       -s     Generate the bogusmon , engrave and epitaphfiles.
  
+        -s     Generate the bogusmon , engrave and epitaphfiles.
+ 
         -h     Generate the oracles file.
  
         -z     Generate vis_tab.c and vis_tab.h.
@@@ -148,4 -144,4 +148,5 @@@ COPYRIGH
  
  
  
- NETHACK                           25 May 2015                      MAKEDEFS(6)
++
+ NETHACK                           1 Jan 2020                       MAKEDEFS(6)