subdirs was a bad idea. back it out

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

diff --git a/Makefile b/Makefile
index a159df33e5c14bad3ad979f95c9d766969540d0a..171c0bbbb31bc0af050fb2fa5d3b8e4f42e85bbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,9 @@ else
 endif
 
 ifeq (1,$(VIRUS))
-  EDITOR = editors/virus.c
+  EDITOR = virus.c
 else
-  EDITOR = editors/ee.c
+  EDITOR = ee.c
 endif
 
 CC = gcc

diff --git a/dgl-create-chroot b/dgl-create-chroot
index 021043d4053b59f5410cf4b82db1fac2569d40a6..1efeea0b13c6fd12df6d42c74c0eed5a0b3b0575 100755 (executable)
--- a/dgl-create-chroot
+++ b/dgl-create-chroot
@@ -26,7 +26,6 @@ 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()
 {
@@ -72,8 +71,8 @@ touch $chroot_path/dgl-login
 touch $chroot_path/dgl-lock
 
 # Might want to remove these two for packaging?
-cp etc/dgl-default-rcfile $chroot_path
-cp etc/dgl-banner $chroot_path
+cp dgl-default-rcfile $chroot_path
+cp dgl-banner $chroot_path
 
 chown $shed_uid:$shed_gid $chroot_path/dgl-*