head	1.3;
access;
symbols
	RELEASE_8_3_0:1.1;
locks; strict;
comment	@# @;


1.3
date	2012.11.01.18.54.07;	author osa;	state Exp;
branches;
next	1.2;

1.2
date	2012.10.18.18.17.09;	author osa;	state Exp;
branches;
next	1.1;

1.1
date	2012.01.19.18.09.08;	author osa;	state Exp;
branches;
next	;


desc
@@


1.3
log
@SVN rev 306817 on 2012-11-01 18:54:07Z by osa

Update from 2.0.0-beta11 to 2.0.0-rc1.

ChangeLog:	http://luajit.org/changes.html

Feature safe:	yes
@
text
@--- Makefile.orig	2012-11-01 22:39:35.000000000 +0400
+++ Makefile	2012-11-01 22:42:58.000000000 +0400
@@@@ -24,14 +24,16 @@@@
 # Change the installation path as needed. This automatically adjusts
 # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
 #
-export PREFIX= /usr/local
+#export PREFIX= /usr/local
 ##############################################################################
 
 DPREFIX= $(DESTDIR)$(PREFIX)
 INSTALL_BIN=   $(DPREFIX)/bin
 INSTALL_LIB=   $(DPREFIX)/lib
+INSTALL_LIBD=  $(DPREFIX)/libdata
 INSTALL_SHARE= $(DPREFIX)/share
 INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
+INSTALL_MAN=   $(DPREFIX)/man/man1
 
 INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
 INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
@@@@ -39,14 +41,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
 
 INSTALL_TNAME= luajit-$(VERSION)
 INSTALL_TSYMNAME= luajit
 INSTALL_ANAME= libluajit-$(ABIVER).a
 INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
-INSTALL_SOSHORT= libluajit-$(ABIVER).so
+INSTALL_SOSHORT= libluajit-$(ABIVER).so.$(MAJVER)
 INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
 INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
 INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
@@@@ -60,8 +61,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)
+INSTALL_DIRS= $(INSTALL_INC) \
+  $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB)
 UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
   $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
 
@@@@ -110,10 +111,8 @@@@
 	$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
 	cd src && test -f $(FILE_SO) && \
 	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
-	  $(LDCONFIG) $(INSTALL_LIB) && \
 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
-	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
 	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
 	  $(RM) $(FILE_PC).tmp
@@@@ -131,7 +130,6 @@@@
 	for file in $(FILES_INC); do \
 	  $(UNINSTALL) $(INSTALL_INC)/$$file; \
 	  done
-	$(LDCONFIG) $(INSTALL_LIB)
 	$(RMDIR) $(UNINSTALL_DIRS) || :
 	@@echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ===="
 
@


1.2
log
@SVN rev 306079 on 2012-10-18 18:17:09Z by osa

Update from 2.0.0-beta10 to 2.0.0-beta11.
Remove needless patch.

ChangeLog:	http://luajit.org/changes.html

Feature safe:	yes
@
text
@d1 3
a3 3
--- Makefile.orig	2012-10-16 22:30:00.000000000 +0400
+++ Makefile	2012-10-18 22:11:09.000000000 +0400
@@@@ -25,14 +25,16 @@@@
d21 1
a21 1
@@@@ -40,14 +42,13 @@@@
d38 1
a38 1
@@@@ -61,10 +62,8 @@@@
a43 2
-UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
-  $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
d46 2
d49 2
a50 4
 RM= rm -f
 MKDIR= mkdir -p
@@@@ -111,10 +110,8 @@@@
 	$(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
d60 1
a60 1
@@@@ -137,7 +134,6 @@@@
a64 1
 	test -f $(INSTALL_TSYM) || $(UNINSTALL) $(INSTALL_TSYM)
d67 1
@


1.1
log
@Move luajit from devel to lang directory.

Notice from:	linimon
@
text
@d1 3
a3 3
--- Makefile.orig	2011-12-14 18:15:00.000000000 +0400
+++ Makefile	2012-01-13 09:09:42.000000000 +0400
@@@@ -26,26 +26,27 @@@@
d19 6
a24 3
 INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit
 INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER)
 INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER)
d35 4
a38 4
 INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
 INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib
 INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib
@@@@ -59,8 +60,8 @@@@
d44 2
d51 1
a51 1
@@@@ -105,10 +106,8 @@@@
d62 8
@

