From d55a5826e81136a9ecf65c4cd407152a56684dc2 Mon Sep 17 00:00:00 2001
From: Diego Nehab <diego@tecgraf.puc-rio.br>
Date: Tue, 22 Nov 2005 08:33:29 +0000
Subject: Few tweaks in installation, some missing files, etc.

---
 makefile | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index c84ef10..f77bde5 100644
--- a/makefile
+++ b/makefile
@@ -6,9 +6,9 @@ include config
 #------
 # Hopefully no need to change anything below this line
 #
-INSTALL_SOCKET_LUA=$(INSTALL_TOP_LUA)/socket
+INSTALL_SOCKET_SHARE=$(INSTALL_TOP_SHARE)/socket
 INSTALL_SOCKET_LIB=$(INSTALL_TOP_LIB)/socket
-INSTALL_MIME_LUA=$(INSTALL_TOP_LUA)/mime
+INSTALL_MIME_SHARE=$(INSTALL_TOP_SHARE)/mime
 INSTALL_MIME_LIB=$(INSTALL_TOP_LIB)/mime
 
 all clean:
@@ -17,35 +17,34 @@ all clean:
 #------
 # Files to install
 #
-TO_SOCKET_LUA:= \
-	socket.lua \
+TO_SOCKET_SHARE:= \
 	http.lua \
 	url.lua \
 	tp.lua \
 	ftp.lua \
 	smtp.lua
 
-TO_TOP_LUA:= \
-	ltn12.lua
-
-TO_MIME_LUA:= \
+TO_TOP_SHARE:= \
+	$(COMPAT)/compat-5.1.lua \
+	ltn12.lua \
+	socket.lua \
 	mime.lua
 
+TO_MIME_SHARE:= 
+
 #------
 # Install LuaSocket according to recommendation
 #
 install: all
-	cd src; mkdir -p $(INSTALL_TOP_LUA)
-	cd src; mkdir -p $(INSTALL_TOP_LIB)
-	cd src; $(INSTALL_DATA) $(COMPAT)/compat-5.1.lua $(INSTALL_TOP_LUA)
-	cd src; $(INSTALL_DATA) ltn12.lua $(INSTALL_TOP_LUA)
-	cd src; mkdir -p $(INSTALL_SOCKET_LUA)
+	cd src; mkdir -p $(INSTALL_TOP_SHARE)
+	cd src; $(INSTALL_DATA) $(TO_TOP_SHARE) $(INSTALL_TOP_SHARE)
+	cd src; mkdir -p $(INSTALL_SOCKET_SHARE)
+	cd src; $(INSTALL_DATA) $(TO_SOCKET_SHARE) $(INSTALL_SOCKET_SHARE)
 	cd src; mkdir -p $(INSTALL_SOCKET_LIB)
-	cd src; $(INSTALL_DATA) $(TO_SOCKET_LUA) $(INSTALL_SOCKET_LUA)
 	cd src; $(INSTALL_EXEC) $(SOCKET_SO) $(INSTALL_SOCKET_LIB)/core.$(EXT)
-	cd src; mkdir -p $(INSTALL_MIME_LUA)
+	#cd src; mkdir -p $(INSTALL_MIME_SHARE)
+	#cd src; $(INSTALL_DATA) $(TO_MIME_SHARE) $(INSTALL_MIME_SHARE)
 	cd src; mkdir -p $(INSTALL_MIME_LIB)
-	cd src; $(INSTALL_DATA) $(TO_MIME_LUA) $(INSTALL_MIME_LUA)
 	cd src; $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(EXT)
 
 #------
-- 
cgit v1.2.3-55-g6feb