tweak some stuff to reflect the new directory organization

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

diff --git a/Makefile b/Makefile
index f4d44c21ed25e58435ed3481b223b03538449d52..4910e970e28113e5628ec73afff7e5084b3af0dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,9 @@ else
 endif
 
 ifeq (1,$(VIRUS))
-  EDITOR = virus.c
+  EDITOR = editors/virus.c
 else
-  EDITOR = ee.c
+  EDITOR = editors/ee.c
 endif
 
 CC = gcc

diff --git a/README b/README
index 265f54a42b3c00183d985bdde4bde9022490a6d0..1e43eecf389a659a7f13942a8ccd5adec901b4ee 100644 (file)
--- a/README
+++ b/README
@@ -49,7 +49,7 @@ variable in include/unixconf.h and/or the HACKDIR variable in include/config.h.
 need to put gzip in there though if you compile nethack to use it for 
 compression.)
 
-3) Edit dgamelaunch.conf. This will contain information for dgamelaunch
+3) Edit etc/dgamelaunch.conf. This will contain information for dgamelaunch
 about what uid/username, gid/group to shed privileges to at runtime. It
 must also contain the path to nethack, and needs to know certain aspects
 of your chroot.

diff --git a/dgl-create-chroot b/dgl-create-chroot
index 1efeea0b13c6fd12df6d42c74c0eed5a0b3b0575..021043d4053b59f5410cf4b82db1fac2569d40a6 100755 (executable)
--- a/dgl-create-chroot
+++ b/dgl-create-chroot
@@ -26,6 +26,7 @@ playground_var="/var/games/nethack"
 termdata="/usr/share/terminfo"
 
 [ -f dgl-create-chroot.conf ] && . ./dgl-create-chroot.conf
+[ -f etc/dgl-create-chroot.conf ] && . etc/dgl-create-chroot.conf
 
 findlibs()
 {
@@ -71,8 +72,8 @@ touch $chroot_path/dgl-login
 touch $chroot_path/dgl-lock
 
 # Might want to remove these two for packaging?
-cp dgl-default-rcfile $chroot_path
-cp dgl-banner $chroot_path
+cp etc/dgl-default-rcfile $chroot_path
+cp etc/dgl-banner $chroot_path
 
 chown $shed_uid:$shed_gid $chroot_path/dgl-*
 

diff --git a/virus.c b/virus.c
index f6fd55f673589b55fd1186d71e2d3003e22562b3..b18e3104d1abd597ef51fcc32f3e2614ce29cb19 100644 (file)
--- a/virus.c
+++ b/virus.c
@@ -81,7 +81,7 @@ char *vi_Version = "0.0.2+dgamelaunch " VERSION;
 #include <errno.h>
 #include <stdarg.h>
 
-#include "last_char_is.c"
+#include "editors/last_char_is.c"
 
 #ifndef TRUE
 #define TRUE                   ((int)1)