rearranged src directory

lunarmodules · Mar 25, 2015 · da50a9d · da50a9d
1 parent ecce156
commit da50a9d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -8,6 +8,10 @@ LUA_DIR= $(PREFIX)/share/lua/5.1
 
 install:
 	mkdir -p $(LUA_DIR)/copas
-	cp src/copas/copas.lua $(LUA_DIR)/copas.lua
+	cp src/copas.lua $(LUA_DIR)/copas.lua
+	cp src/copas/ftp.lua $(LUA_DIR)/copas/ftp.lua
+	cp src/copas/smtp.lua $(LUA_DIR)/copas/smtp.lua
+	cp src/copas/http.lua $(LUA_DIR)/copas/http.lua
+	cp src/copas/limit.lua $(LUA_DIR)/copas/limit.lua
 
 clean:
diff --git a/Makefile.win b/Makefile.win
@@ -5,4 +5,10 @@ LUA_DIR= c:\lua5.1\lua
 build clean:
 
 install:
-	copy src\copas\copas.lua "$(LUA_DIR)"
+	mkdir "$(LUA_DIR)\copas"
+	copy src\copas.lua "$(LUA_DIR)"
+	copy src\copas.lua "$(LUA_DIR)\copas.lua"
+	copy src\copas\ftp.lua "$(LUA_DIR)\copas\ftp.lua"
+	copy src\copas\smtp.lua "$(LUA_DIR)\copas\smtp.lua"
+	copy src\copas\http.lua "$(LUA_DIR)\copas\http.lua"
+	copy src\copas\limit.lua "$(LUA_DIR)\copas\limit.lua"
diff --git a/rockspec/copas-cvs-3.rockspec b/rockspec/copas-cvs-3.rockspec
@@ -25,10 +25,10 @@ dependencies = {
 build = {
    type = "builtin",
    modules = { 
-     ["copas"] = "src/copas/copas.lua",
-     ["copas.http"] = "src/copas/copas/http.lua",
-     ["copas.ftp"] = "src/copas/copas/ftp.lua",
-     ["copas.smtp"] = "src/copas/copas/smtp.lua",
-     ["copas.limit"] = "src/copas/copas/limit.lua",
+     ["copas"] = "src/copas.lua",
+     ["copas.http"] = "src/copas/http.lua",
+     ["copas.ftp"] = "src/copas/ftp.lua",
+     ["copas.smtp"] = "src/copas/smtp.lua",
+     ["copas.limit"] = "src/copas/limit.lua",
    }
 }
diff --git a/src/copas/copas.lua → src/copas.lua b/src/copas/copas.lua → src/copas.lua
diff --git a/src/copas/copas/ftp.lua → src/copas/ftp.lua b/src/copas/copas/ftp.lua → src/copas/ftp.lua
diff --git a/src/copas/copas/http.lua → src/copas/http.lua b/src/copas/copas/http.lua → src/copas/http.lua
diff --git a/src/copas/copas/limit.lua → src/copas/limit.lua b/src/copas/copas/limit.lua → src/copas/limit.lua
diff --git a/src/copas/copas/smtp.lua → src/copas/smtp.lua b/src/copas/copas/smtp.lua → src/copas/smtp.lua