Merge branch 'NetHack-3.6.0'
This commit is contained in:
@@ -23,14 +23,14 @@ x) hints=/dev/null
|
||||
;;
|
||||
*) hints=$prefix/$1
|
||||
hfile=$1
|
||||
# sanity check
|
||||
if [ ! -f "$hints" ]; then
|
||||
echo "Cannot find hints file $hfile"
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ ! -f "$hints" ]; then
|
||||
echo "Cannot find hints file $hfile"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
/bin/sh ./mkmkfile.sh Makefile.top TOP ../../Makefile $hints $hfile
|
||||
/bin/sh ./mkmkfile.sh Makefile.dat DAT ../../dat/Makefile $hints $hfile
|
||||
/bin/sh ./mkmkfile.sh Makefile.doc DOC ../../doc/Makefile $hints $hfile
|
||||
|
||||
@@ -119,7 +119,7 @@ char *argv[];
|
||||
argv++;
|
||||
}
|
||||
|
||||
if (!strncmp(argv[1], "-d", 2) && argv[1][2] != 'e') {
|
||||
if (argc > 1 && !strncmp(argv[1], "-d", 2) && argv[1][2] != 'e') {
|
||||
/* avoid matching "-dec" for DECgraphics; since the man page
|
||||
* says -d directory, hope nobody's using -desomething_else
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user