lua: update patch for 5.2 on darwin

This commit is contained in:
Joel Taylor 2015-05-18 13:11:52 -07:00
parent fd588f939c
commit d60058af4b

View File

@ -1,27 +1,27 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 209a132..9387b09 100644 index d2c7db4..dc107b3 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -43,5 +43,5 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris @@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
# What to install. # What to install.
TO_BIN= lua luac TO_BIN= lua luac
TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
-TO_LIB= liblua.a -TO_LIB= liblua.a
+TO_LIB= liblua.${version}.dylib +TO_LIB= liblua.${version}.dylib
TO_MAN= lua.1 luac.1 TO_MAN= lua.1 luac.1
# Lua version and release. # Lua version and release.
@@ -64,3 +64,5 @@ install: dummy @@ -63,6 +63,8 @@ install: dummy
cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
+ ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${majorVersion}.dylib + ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${majorVersion}.dylib
+ ln -s -f liblua.${majorVersion}.dylib $(INSTALL_LIB)/liblua.dylib + ln -s -f liblua.${majorVersion}.dylib $(INSTALL_LIB)/liblua.dylib
ranlib: uninstall:
cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
diff --git a/src/Makefile b/src/Makefile diff --git a/src/Makefile b/src/Makefile
index fea895b..d9146d0 100644 index 7b4b2b7..25001e5 100644
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -28,7 +28,7 @@ MYOBJS= @@ -28,7 +28,7 @@ MYOBJS=