sys/unix/hints/*: mkfontdir and cp -n

Change all the POSTINSTALL 'mkfontdir' to 'mkfontdir -x .lev' although
the mkfontdir version on my system didn't think $(HACKDIR)/*.lev were
font files when I built without dlb.

Also change the PREINSTALL 'cp -n win/X11/nethack.rc ~/.nethackrc' to
keep going if it fails.  The linux hints use 'cp -n' for sysconf but
since it is doing so for the playground directory and 'make install'
starts out by clearing away everything in that directory, it shouldn't
fail.  But some extra bullet proofing there may be warranted.  Only
the initial cp is protected against clobbering an existing file; the
ownership+permission fixups that are applied to the copy of original
file still get applied to an existing one.

diff --git a/sys/unix/hints/linux-qt4 b/sys/unix/hints/linux-qt4
index 80411856280ba83d368e7e46fe9179863957c6ad..910345ed1133ad5a2a71a1d47a44eae56d2e4f15 100644 (file)
--- a/sys/unix/hints/linux-qt4
+++ b/sys/unix/hints/linux-qt4
@@ -1,5 +1,5 @@
 #
-# NetHack 3.6  linux-qt4 $NHDT-Date: 1432512814 2015/05/25 00:13:34 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
+# NetHack 3.6  linux-qt4 $NHDT-Date: 1566346592 2019/08/21 00:16:32 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.27 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details.
 #
@@ -18,7 +18,7 @@ VARDIR = $(HACKDIR)
 
 
 POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; ( cd $(INSTDIR); mkfontdir -x .lev );
 
 CFLAGS=-g -O -I../include -DNOTPARMDECL
 CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"

diff --git a/sys/unix/hints/linux-qt5 b/sys/unix/hints/linux-qt5
index 9a561130f17f77e38476a2ae37ab78ad63eb7394..c1b13d890a8bd0c9cc1fda2ff37bb2f8828450b5 100644 (file)
--- a/sys/unix/hints/linux-qt5
+++ b/sys/unix/hints/linux-qt5
@@ -1,5 +1,5 @@
 #
-# NetHack 3.6  linux-qt5 $NHDT-Date: 1432512814 2015/05/25 00:13:34 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
+# NetHack 3.6  linux-qt5 $NHDT-Date: 1566346602 2019/08/21 00:16:42 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.27 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details.
 #
@@ -18,7 +18,7 @@ VARDIR = $(HACKDIR)
 
 
 POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir -x .lev);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; ( cd $(INSTDIR); mkfontdir -x .lev );
 
 CFLAGS=-g -O -I../include -DNOTPARMDECL
 CFLAGS+=-DHACKDIR=\"$(HACKDIR)\"

diff --git a/sys/unix/hints/linux-x11 b/sys/unix/hints/linux-x11
index 3b1caf8d9546e81704d8fadc4f57552608fdf599..2f340e981ec37da4a80b404179a1a98eef4f5cda 100644 (file)
--- a/sys/unix/hints/linux-x11
+++ b/sys/unix/hints/linux-x11
@@ -1,5 +1,5 @@
 #
-# NetHack 3.6  linux-x11 $NHDT-Date: 1432512814 2015/05/25 00:13:34 $  $NHDT-Branch: master $:$NHDT-Revision: 1.12 $
+# NetHack 3.6  linux-x11 $NHDT-Date: 1566346602 2019/08/21 00:16:42 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.24 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details. 
 #
@@ -18,7 +18,7 @@ VARDIR = $(HACKDIR)
 
 
 POSTINSTALL= cp -n sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir -x .lev);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; ( cd $(INSTDIR); mkfontdir -x .lev );
 
 CFLAGS=-g -O -I../include -DNOTPARMDECL
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\"

diff --git a/sys/unix/hints/macosx b/sys/unix/hints/macosx
index 0cd98b3fab4b20e12d14fa617bfce267d4627b36..5734732492e2e952a2184fc100404dae89948484 100644 (file)
--- a/sys/unix/hints/macosx
+++ b/sys/unix/hints/macosx
@@ -1,13 +1,12 @@
 #
-# NetHack 3.6  macosx $NHDT-Date: 1447844580 2015/11/18 11:03:00 $  $NHDT-Branch: master $:$NHDT-Revision: 1.18 $
+# NetHack 3.6  macosx $NHDT-Date: 1566346603 2019/08/21 00:16:43 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.20 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
 # NetHack may be freely redistributed.  See license for details.
 #
 #-PRE
 # Mac OS X (Darwin) hints file
-# This is for Mac OS X 10.4.10 (Darwin 8.10).  If this doesn't work for some
-# other version of either Darwin or Mac OS X, make a new file for that OS,
-# don't change this one.  And let us know about it.
+# This is for Mac OS X 10.4 (Darwin 8.10).  Use one of the more specific
+# hints files for later versions.
 # Useful info: http://www.opensource.apple.com/darwinsource/index.html
 
 # This hints file can build several different types of installations.
@@ -72,7 +71,7 @@ WINOBJ += $(WINX11OBJ)
 WINLIB += $(WINX11LIB)
 LFLAGS=-L/usr/X11R6/lib
 VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-POSTINSTALL= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir)
+POSTINSTALL= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; ( cd $(INSTDIR); mkfontdir -x .lev )
 CFLAGS += -DX11_GRAPHICS
 endif
 

diff --git a/sys/unix/hints/macosx10.10 b/sys/unix/hints/macosx10.10
index e53a80d77d17fee9ccd740f1678e2e2d9ee943a4..279a15ec3195ec039cfef093691c1f5513fec7e8 100644 (file)
--- a/sys/unix/hints/macosx10.10
+++ b/sys/unix/hints/macosx10.10
@@ -1,11 +1,11 @@
 #
-# NetHack 3.6  macosx10.11 $NHDT-Date: 1546220383 2018/12/31 01:39:43 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.51 $
+# NetHack 3.6  macosx10.11 $NHDT-Date: 1566346603 2019/08/21 00:16:43 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.53 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
 # NetHack may be freely redistributed.  See license for details.
 #
 #-PRE
 # Mac OS X (Darwin) hints file
-# This is for Mac OS X 10.10 or later, and has been tested on 10.11
+# This is for Mac OS X 10.10 through 10.13, and has been tested on 10.11
 # (El Capitan) and 10.13. If this doesn't work for some other
 # version of Mac OS X, make a new file for that OS, don't change this one.
 # And let us know about it.
@@ -108,7 +108,8 @@ endif
 ifdef WANT_WIN_X11
 WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
 VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir);
+# -x: if built without dlb, some versions of mkfontdir think *.lev are fonts
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
 # separate from CFLAGS so that we don't pass it to every file
 X11CFLAGS = -I/opt/X11/include
 CFLAGS += -DX11_GRAPHICS
@@ -204,7 +205,7 @@ VARFILEPERM = 0600
 VARDIRPERM = 0700
 ifdef WANT_WIN_X11
 # install nethack.rc as ~/.nethackrc if no ~/.nethackrc exists
-PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc
+PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc || true
 endif  # WANT_WIN_X11
 POSTINSTALL+= sys/unix/hints/macosx.sh editsysconf sys/unix/sysconf $(HACKDIR)/sysconf; $(CHOWN) $(GAMEUID) $(HACKDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(HACKDIR)/sysconf; chmod $(VARFILEPERM) $(HACKDIR)/sysconf;
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE

diff --git a/sys/unix/hints/macosx10.10-qt b/sys/unix/hints/macosx10.10-qt
index 3d9747649442abde95e8998d5adc17e75ff87395..865c2d20ab4e69cfa0491be9669ec25940b9ae1e 100644 (file)
--- a/sys/unix/hints/macosx10.10-qt
+++ b/sys/unix/hints/macosx10.10-qt
@@ -1,12 +1,12 @@
 #
-# NetHack 3.6  macosx10.11 $NHDT-Date: 1515549543 2018/01/10 01:59:03 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.48 $
+# NetHack 3.6  macosx10.11 $NHDT-Date: 1566346604 2019/08/21 00:16:44 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.51 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
 # NetHack may be freely redistributed.  See license for details.
 #
 #-PRE
 # Mac OS X (Darwin) hints file
-# This is for Mac OS X 10.10 or later, and has been tested on 10.11
-# (El Capitan). If this doesn't work for some other
+# This is for the Qt interface on Mac OS X 10.10 through 10.13, and has
+# been tested on 10.11 (El Capitan). If this doesn't work for some other
 # version of Mac OS X, make a new file for that OS, don't change this one.
 # And let us know about it.
 # Useful info: http://www.opensource.apple.com/darwinsource/index.html
@@ -106,7 +106,7 @@ WINOBJ0 += $(WINX11OBJ)
 WINLIB += $(WINX11LIB)
 LFLAGS += -L/opt/X11/lib
 VARDATND += x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
 CFLAGS += -DX11_GRAPHICS -I/opt/X11/include
 # avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
 CFLAGS += -Wno-variadic-macros
@@ -184,7 +184,7 @@ VARFILEPERM = 0600
 VARDIRPERM = 0700
 ifdef WANT_WIN_X11
 # install nethack.rc as ~/.nethackrc if no ~/.nethackrc exists
-PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc
+PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc || true
 endif  # WANT_WIN_X11
 POSTINSTALL+= sys/unix/hints/macosx.sh editsysconf sys/unix/sysconf $(HACKDIR)/sysconf; $(CHOWN) $(GAMEUID) $(HACKDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(HACKDIR)/sysconf; chmod $(VARFILEPERM) $(HACKDIR)/sysconf;
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE

diff --git a/sys/unix/hints/macosx10.14 b/sys/unix/hints/macosx10.14
index c5e5a0cf13bcc7e39845f1ed000722b438b256ab..751ba7774eed7251f2bb28f714542cb17bd9d80f 100644 (file)
--- a/sys/unix/hints/macosx10.14
+++ b/sys/unix/hints/macosx10.14
@@ -1,5 +1,5 @@
 #
-# NetHack 3.6  macosx10.14 $NHDT-Date: 1546225353 2018/12/31 03:02:33 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.57 $
+# NetHack 3.6  macosx10.14 $NHDT-Date: 1566346605 2019/08/21 00:16:45 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.59 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015.
 # NetHack may be freely redistributed.  See license for details.
 #
@@ -108,7 +108,7 @@ endif
 ifdef WANT_WIN_X11
 WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
 VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
 # separate from CFLAGS so that we don't pass it to every file
 X11CFLAGS = -I/opt/X11/include
 CFLAGS += -DX11_GRAPHICS
@@ -204,7 +204,7 @@ VARFILEPERM = 0600
 VARDIRPERM = 0700
 ifdef WANT_WIN_X11
 # install nethack.rc as ~/.nethackrc if no ~/.nethackrc exists
-PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc
+PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc || true
 endif  # WANT_WIN_X11
 POSTINSTALL+= sys/unix/hints/macosx.sh editsysconf sys/unix/sysconf $(HACKDIR)/sysconf; $(CHOWN) $(GAMEUID) $(HACKDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(HACKDIR)/sysconf; chmod $(VARFILEPERM) $(HACKDIR)/sysconf;
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE

diff --git a/sys/unix/hints/macosx10.5 b/sys/unix/hints/macosx10.5
index f6d9e548319042b1e5c42da1248ca1b1f9389bf2..3cbe335be4c31bc16aaf1b6617bd5e610f7ec582 100644 (file)
--- a/sys/unix/hints/macosx10.5
+++ b/sys/unix/hints/macosx10.5
@@ -1,11 +1,12 @@
 #
-# NetHack 3.6  macosx10.5 $NHDT-Date: 1546082882 2018/12/29 11:28:02 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.30 $
+# NetHack 3.6  macosx10.5 $NHDT-Date: 1566346606 2019/08/21 00:16:46 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.32 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
 # NetHack may be freely redistributed.  See license for details.
 #
 #-PRE
 # Mac OS X (Darwin) hints file
-# This is for Mac OS X 10.5.3 (Darwin 9.3).  If this doesn't work for some
+# This is for Mac OS X 10.5 (Darwin 9.3) and also 10.6.
+# If this doesn't work for some
 # other version of either Darwin or Mac OS X, make a new file for that OS,
 # don't change this one.  And let us know about it.
 # Useful info: http://www.opensource.apple.com/darwinsource/index.html
@@ -78,7 +79,7 @@ endif # !WANT_WIN_TTY
 ifdef WANT_WIN_X11
 WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
 VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; ( cd $(INSTDIR); mkfontdir -x .lev );
 CFLAGS += -DX11_GRAPHICS
 ifdef USE_XPM
 CFLAGS += -DUSE_XPM
@@ -176,7 +177,7 @@ VARFILEPERM = 0600
 VARDIRPERM = 0700
 ifdef WANT_WIN_X11
 # install nethack.rc as ~/.nethackrc if no ~/.nethackrc exists
-PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc
+PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc || true
 endif  # WANT_WIN_X11
 POSTINSTALL+= sys/unix/hints/macosx.sh editsysconf sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE

diff --git a/sys/unix/hints/macosx10.7 b/sys/unix/hints/macosx10.7
index 776cb4b810ae2573c940524a54dd6c96e23d4dfb..4937c64dcd763cc8aeb214031bb753d83cd6beca 100644 (file)
--- a/sys/unix/hints/macosx10.7
+++ b/sys/unix/hints/macosx10.7
@@ -1,11 +1,12 @@
 #
-# NetHack 3.6  macosx10.7 $NHDT-Date: 1546082882 2018/12/29 11:28:02 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.34 $
+# NetHack 3.6  macosx10.7 $NHDT-Date: 1566346606 2019/08/21 00:16:46 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.36 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
 # NetHack may be freely redistributed.  See license for details.
 #
 #-PRE
 # Mac OS X (Darwin) hints file
-# This is for Mac OS X 10.7.2.  If this doesn't work for some other version
+# This is for Mac OS X 10.7.
+# If this doesn't work for some other version
 # of Mac OS X, make a new file for that OS, don't change this one.  And
 # let us know about it.
 # Useful info: http://www.opensource.apple.com/darwinsource/index.html
@@ -95,7 +96,7 @@ endif # !WANT_WIN_TTY
 ifdef WANT_WIN_X11
 WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
 VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; ( cd $(INSTDIR); mkfontdir -x .lev );
 CFLAGS += -DX11_GRAPHICS
 ifdef USE_XPM
 CFLAGS += -DUSE_XPM
@@ -194,7 +195,7 @@ VARFILEPERM = 0600
 VARDIRPERM = 0700
 ifdef WANT_WIN_X11
 # install nethack.rc as ~/.nethackrc if no ~/.nethackrc exists
-PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc
+PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc || true
 endif  # WANT_WIN_X11
 POSTINSTALL+= sys/unix/hints/macosx.sh editsysconf sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE

diff --git a/sys/unix/hints/macosx10.8 b/sys/unix/hints/macosx10.8
index 87d0e83055b9d31c932cc7e6c7a0406e3a7afa58..a6e9c4d3c359e5f65612958938179ad22c6a3c77 100644 (file)
--- a/sys/unix/hints/macosx10.8
+++ b/sys/unix/hints/macosx10.8
@@ -1,11 +1,11 @@
 #
-# NetHack 3.6  macosx10.8 $NHDT-Date: 1546220385 2018/12/31 01:39:45 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.36 $
+# NetHack 3.6  macosx10.8 $NHDT-Date: 1566346607 2019/08/21 00:16:47 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.38 $
 # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2009.
 # NetHack may be freely redistributed.  See license for details.
 #
 #-PRE
 # Mac OS X (Darwin) hints file
-# This is for Mac OS X 10.8, Mountain Lion.
+# This is for Mac OS X 10.8, Mountain Lion, and also 10.9.
 #
 # X11 is no longer included with OSX.
 # To regain X11, download and install XQuartz.  (Attempting to run X11.app
@@ -103,7 +103,7 @@ endif       # !WANT_WIN_TTY
 ifdef WANT_WIN_X11
 WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
 VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
-POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; (cd $(INSTDIR); mkfontdir);
+POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(INSTDIR)/nh10.pcf; ( cd $(INSTDIR); mkfontdir -x .lev );
 # separate from CFLAGS so that we don't pass it to every file
 X11CFLAGS = -I/opt/X11/include
 CFLAGS += -DX11_GRAPHICS
@@ -206,7 +206,7 @@ VARFILEPERM = 0600
 VARDIRPERM = 0700
 ifdef WANT_WIN_X11
 # install nethack.rc as ~/.nethackrc if no ~/.nethackrc exists
-PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc
+PREINSTALL= cp -n win/X11/nethack.rc ~/.nethackrc || true
 endif  # WANT_WIN_X11
 POSTINSTALL+= sys/unix/hints/macosx.sh editsysconf sys/unix/sysconf $(INSTDIR)/sysconf; $(CHOWN) $(GAMEUID) $(INSTDIR)/sysconf; $(CHGRP) $(GAMEGRP) $(INSTDIR)/sysconf; chmod $(VARFILEPERM) $(INSTDIR)/sysconf;
 CFLAGS+=-DSYSCF -DSYSCF_FILE=\"$(HACKDIR)/sysconf\" -DSECURE