diff options
Diffstat (limited to 'lang/luajit/files/patch-Makefile')
| -rw-r--r-- | lang/luajit/files/patch-Makefile | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/lang/luajit/files/patch-Makefile b/lang/luajit/files/patch-Makefile index 995433042e5c..84d04f4335f4 100644 --- a/lang/luajit/files/patch-Makefile +++ b/lang/luajit/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2011-12-14 18:15:00.000000000 +0400 -+++ Makefile 2012-01-13 09:09:42.000000000 +0400 -@@ -26,26 +26,27 @@ +--- Makefile.orig 2012-10-16 22:30:00.000000000 +0400 ++++ Makefile 2012-10-18 22:11:09.000000000 +0400 +@@ -25,14 +25,16 @@ # Change the installation path as needed. This automatically adjusts # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path! # @@ -16,9 +16,12 @@ INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) +INSTALL_MAN= $(DPREFIX)/man/man1 - INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit - INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER) - INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER) + INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit +@@ -40,14 +42,13 @@ + INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) + INSTALL_CMODD= $(INSTALL_LIB)/lua + INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) -INSTALL_MAN= $(INSTALL_SHARE)/man/man1 -INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig +INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig @@ -29,21 +32,23 @@ INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) -INSTALL_SOSHORT= libluajit-$(ABIVER).so +INSTALL_SOSHORT= libluajit-$(ABIVER).so.$(MAJVER) - INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib - INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib - INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib -@@ -59,8 +60,8 @@ + INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib + INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib + INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib +@@ -61,10 +62,8 @@ INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) -INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ - $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) +-UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ +- $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) +INSTALL_DIRS= $(INSTALL_INC) \ + $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) RM= rm -f MKDIR= mkdir -p -@@ -105,10 +106,8 @@ +@@ -111,10 +110,8 @@ $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) cd src && test -f $(FILE_SO) && \ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ @@ -54,3 +59,11 @@ cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ $(RM) $(FILE_PC).tmp +@@ -137,7 +134,6 @@ + for file in $(FILES_INC); do \ + $(UNINSTALL) $(INSTALL_INC)/$$file; \ + done +- $(LDCONFIG) $(INSTALL_LIB) + test -f $(INSTALL_TSYM) || $(UNINSTALL) $(INSTALL_TSYM) + $(RMDIR) $(UNINSTALL_DIRS) || : + @echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ====" |