PLEASE LOOK AT THE DGL-CREATE-CHROOT SCRIPT

before you run it again. Same with the Makefile.
Most important change is in dgamelaunch.c

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@271 db0b04b0-f4d1-0310-9a6d-de3e77497b0e

diff --git a/Makefile b/Makefile
index c7e1e2d4c6d5a68482c733c97e51f4c4436d04c5..221c458ad271cf9174a1e8bd0ca87c01facd01bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ SRCS = $(EDITOR) dgl-common.c ttyrec.c dgamelaunch.c io.c ttyplay.c mygetnstr.c
 EXTRA_SRCS = nethackstub.c
 OBJS = $(SRCS:.c=.o)
 WALL_OBJS = y.tab.o lex.yy.o dgl-common.o dgl-wall.o strlcat.o strlcpy.o
-LIBS = -lcurses -lcrypt $(LUTIL) -ll
+LIBS = -lcurses $(LUTIL) -ll
 
 all: $(NAME) dgl-wall
 

diff --git a/config.y b/config.y
index 6fddb608a2695af8915733efbc178dbc7300858a..ead0bb93e0fd11b537d744bde22e5848d1376fa3 100644 (file)
--- a/config.y
+++ b/config.y
@@ -1,5 +1,7 @@
 %{
 
+#include <sys/types.h>
+
 #include <grp.h>
 #include <pwd.h>
 #include <stdlib.h>

diff --git a/dgamelaunch.c b/dgamelaunch.c
index 19cbed77fcc630ea3c33fd5f1ccc748d2af7d91f..2e43950deeabc8459bc67514c69030111d3c7b47 100644 (file)
--- a/dgamelaunch.c
+++ b/dgamelaunch.c
@@ -44,7 +44,6 @@
 /* ************************************************************* */
 
 /* program stuff */
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
@@ -55,16 +54,22 @@
 #include <curses.h>
 
 #ifndef __FreeBSD__
-# include <crypt.h>
+# ifdef __APPLE__
+#  include <unistd.h>
+# else
+#  include <crypt.h>
+# endif
 #else
 # include <libutil.h>
 #endif
 
+
+
 #ifdef __linux__
 # include <pty.h>
 #endif
 
-#ifndef ARRAY_SIZE
+#ifndef ARRAY_SIZEK
 # define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 #endif
 

diff --git a/dgl-create-chroot b/dgl-create-chroot
index 1efeea0b13c6fd12df6d42c74c0eed5a0b3b0575..f0e0f6a999d67174f46ea211dcfd4cd3ad7fa29a 100755 (executable)
--- a/dgl-create-chroot
+++ b/dgl-create-chroot
@@ -17,11 +17,11 @@ libs=""
 # (leave blank to skip)
 compress_bin="gzip"
 # nethack binary to copy (leave blank to skip)
-nethack_bin="/usr/lib/games/nethack/nethack-console"
+nethack_bin="/opt/local/bin/nethack"
 # fixed data to copy (leave blank to skip)
-playground_fixed="/usr/lib/games/nethack"
+playground_fixed="/opt/local/share/nethackdir/"
 # variable data to create (leave blank to skip) (may be equal to previous)
-playground_var="/var/games/nethack"
+playground_var=""
 # termcap/terminfo (copied recursively) (leave blank to skip)
 termdata="/usr/share/terminfo"