X11: Handle define-lines in NetHack.ad

xrdb can load a X recource file with #define-lines, but NetHack
cannot. Substitute the defines in Makefile during compile.

Requires grep

diff --git a/sys/unix/Makefile.dat b/sys/unix/Makefile.dat
index 535e7a8089a95225803cb53bd998f225572214d6..6327b0c10dd0397861701c9b1103320634adda94 100644 (file)
--- a/sys/unix/Makefile.dat
+++ b/sys/unix/Makefile.dat
@@ -50,7 +50,13 @@ nhtiles.bmp: ../util/tile2bmp ../win/share/monsters.txt \
        ../util/tile2bmp $@
 
 NetHack.ad: ../win/X11/NetHack.ad
-       cp ../win/X11/NetHack.ad NetHack.ad
+# handle "#define foo bar" -lines
+       grep ^#define ../win/X11/NetHack.ad | \
+               sed -e 's/^#define/s/g' -e 's/  */ /g' \
+                   -e 's/$$/ g/g' > NetHack.ad.tmp
+       grep -v ^#define ../win/X11/NetHack.ad | \
+               sed -f NetHack.ad.tmp > NetHack.ad
+       -rm -f NetHack.ad.tmp
 
 pet_mark.xbm: ../win/X11/pet_mark.xbm
        cp ../win/X11/pet_mark.xbm pet_mark.xbm