Skip to content

Commit

Permalink
Import Lua 5.1.5 (rc2)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lua Team authored and ittner committed Feb 13, 2012
1 parent 0b6d344 commit 49a7bfe
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Binary file removed doc/amazon.gif
Binary file not shown.
12 changes: 2 additions & 10 deletions doc/contents.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,7 @@ <H1>
&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.
Expand Down Expand Up @@ -495,7 +487,7 @@ <H3>auxiliary library</H3>
<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
Expand Down
4 changes: 3 additions & 1 deletion doc/manual.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ <h1>
<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>
Expand Down Expand Up @@ -8792,7 +8794,7 @@ <h1>8 - <a name="8">The Complete Syntax of Lua</a></h1>
<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
Expand Down
2 changes: 1 addition & 1 deletion etc/lua.pc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 49a7bfe

Please sign in to comment.