1 files changed, 19 insertions, 18 deletions

diff --git a/makefile b/makefile
index 234e162..c84ef10 100644
--- a/makefile
+++ b/makefile
@@ -6,8 +6,10 @@ include config
 #------
 # Hopefully no need to change anything below this line
 #
-INSTALL_SOCKET=$(INSTALL_TOP)/socket
-INSTALL_MIME=$(INSTALL_TOP)/mime
+INSTALL_SOCKET_LUA=$(INSTALL_TOP_LUA)/socket
+INSTALL_SOCKET_LIB=$(INSTALL_TOP_LIB)/socket
+INSTALL_MIME_LUA=$(INSTALL_TOP_LUA)/mime
+INSTALL_MIME_LIB=$(INSTALL_TOP_LIB)/mime
 
 all clean:
         cd src; $(MAKE) $@
@@ -15,7 +17,7 @@ all clean:
 #------
 # Files to install
 #
-TO_SOCKET:= \
+TO_SOCKET_LUA:= \
         socket.lua \
         http.lua \
         url.lua \
@@ -23,29 +25,28 @@ TO_SOCKET:= \
         ftp.lua \
         smtp.lua
 
-TO_TOP:= \
+TO_TOP_LUA:= \
         ltn12.lua
 
-TO_MIME:= \
-        $(MIME_SO) \
+TO_MIME_LUA:= \
         mime.lua
 
 #------
 # Install LuaSocket according to recommendation
 #
 install: all
-        cd src; mkdir -p $(INSTALL_TOP)
-        cd src; $(INSTALL_DATA) $(COMPAT)/compat-5.1.lua $(INSTALL_TOP)
-        cd src; $(INSTALL_DATA) ltn12.lua $(INSTALL_TOP)
-        cd src; mkdir -p $(INSTALL_SOCKET)
-        cd src; $(INSTALL_EXEC) $(SOCKET_SO) $(INSTALL_SOCKET)
-        cd src; $(INSTALL_DATA) $(TO_SOCKET) $(INSTALL_SOCKET)
-        cd src; cd $(INSTALL_SOCKET); $(INSTALL_LINK) -s $(SOCKET_SO) core.$(EXT)
-        cd src; cd $(INSTALL_SOCKET); $(INSTALL_LINK) -s socket.lua init.lua
-        cd src; mkdir -p $(INSTALL_MIME)
-        cd src; $(INSTALL_DATA) $(TO_MIME) $(INSTALL_MIME)
-        cd src; cd $(INSTALL_MIME); $(INSTALL_LINK) -s $(MIME_SO) core.$(EXT)
-        cd src; cd $(INSTALL_MIME); $(INSTALL_LINK) -s mime.lua init.lua
+        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_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_LIB)
+        cd src; $(INSTALL_DATA) $(TO_MIME_LUA) $(INSTALL_MIME_LUA)
+        cd src; $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(EXT)
 
 #------
 # End of makefile