For consistency, move source/lua/ to source/dat/lua/.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4867 c06c8d41-db1a-0410-9941-cceddc491573

15 files changed, 4 insertions, 10 deletions

diff --git a/crawl-ref/domake.sh b/crawl-ref/domake.sh
index 4680ab1740..a523e0b3b6 100644
--- a/crawl-ref/domake.sh
+++ b/crawl-ref/domake.sh
@@ -10,9 +10,3 @@ fi
 if [ -f WIZARD/crawl ]; then
 	ln -sf WIZARD/crawl wcrawl
 fi
-
-if [ -d dat/lua ]; then
-	true
-else
-	mkdir -p dat/lua && cp source/lua/*.lua dat/lua
-fi
diff --git a/crawl-ref/source/lua/chnkdata.lua b/crawl-ref/source/dat/lua/chnkdata.lua
index bfc93be699..bfc93be699 100644
--- a/crawl-ref/source/lua/chnkdata.lua
+++ b/crawl-ref/source/dat/lua/chnkdata.lua
diff --git a/crawl-ref/source/lua/eat.lua b/crawl-ref/source/dat/lua/eat.lua
index f27f69068b..f27f69068b 100644
--- a/crawl-ref/source/lua/eat.lua
+++ b/crawl-ref/source/dat/lua/eat.lua
diff --git a/crawl-ref/source/lua/gearset.lua b/crawl-ref/source/dat/lua/gearset.lua
index 392c7e6f60..392c7e6f60 100644
--- a/crawl-ref/source/lua/gearset.lua
+++ b/crawl-ref/source/dat/lua/gearset.lua
diff --git a/crawl-ref/source/lua/kills.lua b/crawl-ref/source/dat/lua/kills.lua
index b84b1f93c0..b84b1f93c0 100644
--- a/crawl-ref/source/lua/kills.lua
+++ b/crawl-ref/source/dat/lua/kills.lua
diff --git a/crawl-ref/source/lua/pickup.lua b/crawl-ref/source/dat/lua/pickup.lua
index feae944ac4..feae944ac4 100644
--- a/crawl-ref/source/lua/pickup.lua
+++ b/crawl-ref/source/dat/lua/pickup.lua
diff --git a/crawl-ref/source/lua/runrest.lua b/crawl-ref/source/dat/lua/runrest.lua
index b3fa362820..b3fa362820 100644
--- a/crawl-ref/source/lua/runrest.lua
+++ b/crawl-ref/source/dat/lua/runrest.lua
diff --git a/crawl-ref/source/lua/safechnk.lua b/crawl-ref/source/dat/lua/safechnk.lua
index 447981f141..447981f141 100644
--- a/crawl-ref/source/lua/safechnk.lua
+++ b/crawl-ref/source/dat/lua/safechnk.lua
diff --git a/crawl-ref/source/lua/stash.lua b/crawl-ref/source/dat/lua/stash.lua
index 3274b41c5b..3274b41c5b 100644
--- a/crawl-ref/source/lua/stash.lua
+++ b/crawl-ref/source/dat/lua/stash.lua
diff --git a/crawl-ref/source/lua/trapwalk.lua b/crawl-ref/source/dat/lua/trapwalk.lua
index c7e535d5c1..c7e535d5c1 100644
--- a/crawl-ref/source/lua/trapwalk.lua
+++ b/crawl-ref/source/dat/lua/trapwalk.lua
diff --git a/crawl-ref/source/lua/wield.lua b/crawl-ref/source/dat/lua/wield.lua
index e4fe9951e3..e4fe9951e3 100644
--- a/crawl-ref/source/lua/wield.lua
+++ b/crawl-ref/source/dat/lua/wield.lua
diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw
index 5b123b0d23..cf802826e0 100644
--- a/crawl-ref/source/makefile.mgw
+++ b/crawl-ref/source/makefile.mgw
@@ -132,7 +132,7 @@ endif
 		mkdir $(INSTALLDIR)\dat\descript 2>null || echo "">nul
 		mkdir $(INSTALLDIR)\dat\database 2>null || echo "">nul
 		copy /y dat\*.des $(INSTALLDIR)\dat
-		copy /y lua\*.lua $(INSTALLDIR)\dat\lua
+		copy /y dat\lua\*.lua $(INSTALLDIR)\dat\lua
 		copy /y dat\clua\*.lua $(INSTALLDIR)\dat\clua
 		copy /y dat\descript\*.txt $(INSTALLDIR)\dat\descript
 		copy /y dat\database\*.txt $(INSTALLDIR)\dat\database
diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix
index 10ef8cb1d0..0d26da696d 100644
--- a/crawl-ref/source/makefile.unix
+++ b/crawl-ref/source/makefile.unix
@@ -236,7 +236,7 @@ endif
 	mkdir -p $(DATADIR)/dat/descript
 	mkdir -p $(DATADIR)/dat/database
 	cp dat/*.des $(DATADIR)/dat
-	cp lua/*.lua $(DATADIR)/dat/lua
+	cp dat/lua/*.lua $(DATADIR)/dat/lua
 	cp dat/clua/*.lua $(DATADIR)/dat/clua
 	cp dat/descript/*.txt $(DATADIR)/dat/descript
 	cp dat/database/*.txt $(DATADIR)/dat/database
diff --git a/crawl-ref/source/makefile.x11 b/crawl-ref/source/makefile.x11
index 48ede2ae23..17f739b9e0 100644
--- a/crawl-ref/source/makefile.x11
+++ b/crawl-ref/source/makefile.x11
@@ -267,7 +267,7 @@ endif
 	mkdir -p $(DATADIR)/dat/descript
 	mkdir -p $(DATADIR)/dat/database
 	cp dat/*.des $(DATADIR)/dat
-	cp lua/*.lua $(DATADIR)/dat/lua
+	cp dat/lua/*.lua $(DATADIR)/dat/lua
 	cp dat/clua/*.lua $(DATADIR)/dat/clua
 	cp dat/descript/*.txt $(DATADIR)/dat/descript
 	cp dat/database/*.txt $(DATADIR)/dat/database
diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw
index 7ed714966f..9db0a94679 100644
--- a/crawl-ref/source/makefile_tiles.mgw
+++ b/crawl-ref/source/makefile_tiles.mgw
@@ -175,7 +175,7 @@ endif
 		mkdir $(INSTALLDIR)\dat\descript 2>null || echo "">nul
 		mkdir $(INSTALLDIR)\dat\database 2>null || echo "">nul
 		copy /y dat\*.des $(INSTALLDIR)\dat
-		copy /y lua\*.lua $(INSTALLDIR)\dat\lua
+		copy /y dat\lua\*.lua $(INSTALLDIR)\dat\lua
 		copy /y dat\clua\*.lua $(INSTALLDIR)\dat\clua
 		copy /y dat\descript\*.txt $(INSTALLDIR)\dat\descript
 		copy /y dat\database\*.txt $(INSTALLDIR)\dat\database