summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLua Team <team@lua.org>2012-02-13 12:00:00 +0000
committerrepogen <>2012-02-13 12:00:00 +0000
commit446741d4085b98564350a70cf58f82f48a25b613 (patch)
treea28e0246f0b0404a5c066b8f2a888db45e30fc44
parentc16585cbf62fae1a5e4788241e94b789a8e05a34 (diff)
downloadlua-github-5.1.x.tar.gz
-rw-r--r--Makefile2
-rw-r--r--doc/contents.html12
-rw-r--r--doc/manual.html4
-rw-r--r--etc/lua.pc2
-rw-r--r--src/Makefile2
5 files changed, 8 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 6e78f66f..209a1324 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ TO_MAN= lua.1 luac.1
# Lua version and release.
V= 5.1
-R= 5.1.4
+R= 5.1.5
all: $(PLAT)
diff --git a/doc/contents.html b/doc/contents.html
index 51848f5d..3d83da98 100644
--- a/doc/contents.html
+++ b/doc/contents.html
@@ -50,15 +50,7 @@ the Lua project.
&middot;
<A HREF="#index">index</A>
&middot;
-<A HREF="http://www.lua.org/manual/5.1/pt/">português</A>
-&middot;
-<A HREF="http://www.lua.org/manual/5.1/es/">español</A>
-&middot;
-<A HREF="http://www.lua.ru/doc/">русский</A>
-&middot;
-<A HREF="http://thor.4242.hu/scripting/manual_hu.html">magyar</A>
-&middot;
-<A HREF="http://lua.coders-online.net/">deutsch</A>
+<A HREF="http://www.lua.org/manual/">other versions</A>
<HR>
<SMALL>
Copyright &copy; 2006&ndash;2012 Lua.org, PUC-Rio.
@@ -495,7 +487,7 @@ Freely available under the terms of the
<HR>
<SMALL CLASS="footer">
Last update:
-Fri Feb 3 09:53:57 BRST 2012
+Mon Feb 13 18:53:32 BRST 2012
</SMALL>
<!--
Last change: revised for Lua 5.1.5
diff --git a/doc/manual.html b/doc/manual.html
index 0f85c6c9..4e41683d 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -29,6 +29,8 @@ Freely available under the terms of the
<a href="contents.html#contents">contents</A>
&middot;
<a href="contents.html#index">index</A>
+&middot;
+<A HREF="http://www.lua.org/manual/">other versions</A>
<!-- ====================================================================== -->
<p>
@@ -8792,7 +8794,7 @@ Here is the complete syntax of Lua in extended BNF.
<HR>
<SMALL CLASS="footer">
Last update:
-Fri Feb 3 09:25:41 BRST 2012
+Mon Feb 13 18:54:19 BRST 2012
</SMALL>
<!--
Last change: revised for Lua 5.1.5
diff --git a/etc/lua.pc b/etc/lua.pc
index f52f55b0..07e2852b 100644
--- a/etc/lua.pc
+++ b/etc/lua.pc
@@ -5,7 +5,7 @@
# grep '^V=' ../Makefile
V= 5.1
# grep '^R=' ../Makefile
-R= 5.1.4
+R= 5.1.5
# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
prefix= /usr/local
diff --git a/src/Makefile b/src/Makefile
index e4a3cd61..e0d4c9fa 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -48,7 +48,7 @@ o: $(ALL_O)
a: $(ALL_A)
$(LUA_A): $(CORE_O) $(LIB_O)
- $(AR) $@ $?
+ $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
$(RANLIB) $@
$(LUA_T): $(LUA_O) $(LUA_A)