From fa8ae973c4df252fea5e97d031bc1e72911b733d Mon Sep 17 00:00:00 2001
From: faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Mon, 20 Aug 2012 12:29:51 +0000
Subject: Updated GNUmakefile to output to MCServer directory Moved
 Lua-LICENSE.txt to Install dir (dont know what happened to the other license
 files :P )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@764 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 GNUmakefile             |  4 ++--
 Install/Lua-LICENSE.txt | 21 +++++++++++++++++++++
 Lua-LICENSE.txt         | 21 ---------------------
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 Install/Lua-LICENSE.txt
 delete mode 100644 Lua-LICENSE.txt

diff --git a/GNUmakefile b/GNUmakefile
index 803730d5d..f398f5506 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -119,10 +119,10 @@ OBJECTS := $(patsubst %.cpp,$(BUILDDIR)%.o,$(OBJECTS))
 -include $(patsubst %.o,%.d,$(OBJECTS))
 
 MCServer : $(OBJECTS)
-	$(CC) $(LNK_OPTIONS) $(OBJECTS) -o MCServer
+	$(CC) $(LNK_OPTIONS) $(OBJECTS) -o MCServer/MCServer
 
 clean : 
-		rm -rf $(BUILDDIR) MCServer
+		rm -rf $(BUILDDIR) MCServer/MCServer
 
 install : MCServer
 		cp MCServer MCServer
diff --git a/Install/Lua-LICENSE.txt b/Install/Lua-LICENSE.txt
new file mode 100644
index 000000000..bc4f3973c
--- /dev/null
+++ b/Install/Lua-LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright (C) 1994-2008 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Lua-LICENSE.txt b/Lua-LICENSE.txt
deleted file mode 100644
index bc4f3973c..000000000
--- a/Lua-LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (C) 1994-2008 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
-- 
cgit v1.2.3