Ticket #34830: files_patch-Makefile.diff

files/patch-Makefile.diff

@@ -1 @@
---- Makefile.orig       2011-03-27 16:49:40.000000000 +0200
-+++ Makefile    2011-03-27 16:52:46.000000000 +0200
-@@ -43,7 +43,7 @@
+--- Makefile.orig       2012-05-17 07:05:54.000000000 -0700
++++ Makefile    2012-08-08 06:21:39.000000000 -0700
+@@ -10,11 +10,11 @@
+ # so take care if INSTALL_TOP is not an absolute path. See the local target.
+ # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
+-INSTALL_TOP= /usr/local
++INSTALL_TOP= ${DESTDIR}@PREFIX@
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+-INSTALL_MAN= $(INSTALL_TOP)/man/man1
++INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
+ INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
+ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+ 
+@@ -41,13 +41,16 @@
  # What to install.
  TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
 -TO_LIB= liblua.a
-+TO_LIB= liblua.a liblua.dylib
++TO_LIB= liblua.$(R).dylib
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -64,6 +64,8 @@
+ V= 5.2
+ R= $V.1
+ 
++# Export variables for sub-make
++export V R INSTALL_LIB
++
+ # Targets start here.
+ all:   $(PLAT)
+ 
+@@ -62,6 +65,10 @@
+        cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
         cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
         cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
++       cd $(INSTALL_LIB) && {                                          \
++               ln -fs liblua.$(R).dylib liblua.dylib;                  \
++               ln -fs liblua.$(R).dylib liblua.$(V).dylib;             \
++       }
         cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-+       cd $(INSTALL_LIB) && ln -s liblua.dylib liblua.%VERSION%.dylib
-+       cd $(INSTALL_LIB) && ln -s liblua.dylib liblua.%COMPAT_VERSION%.dylib
  
- ranlib:
-        cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
+ uninstall: