Date: Saturday, April 19, 2014 @ 14:07:46
Author: bpiotrowski
Revision: 211535
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
lpeg/repos/extra-i686/LICENSE
(from rev 211534, lpeg/trunk/LICENSE)
lpeg/repos/extra-i686/PKGBUILD
(from rev 211534, lpeg/trunk/PKGBUILD)
lpeg/repos/extra-i686/lpeg-0.12-makefile.patch
(from rev 211534, lpeg/trunk/lpeg-0.12-makefile.patch)
lpeg/repos/extra-x86_64/LICENSE
(from rev 211534, lpeg/trunk/LICENSE)
lpeg/repos/extra-x86_64/PKGBUILD
(from rev 211534, lpeg/trunk/PKGBUILD)
lpeg/repos/extra-x86_64/lpeg-0.12-makefile.patch
(from rev 211534, lpeg/trunk/lpeg-0.12-makefile.patch)
Deleted:
lpeg/repos/extra-i686/LICENSE
lpeg/repos/extra-i686/PKGBUILD
lpeg/repos/extra-i686/lpeg-0.12-makefile.patch
lpeg/repos/extra-x86_64/LICENSE
lpeg/repos/extra-x86_64/PKGBUILD
lpeg/repos/extra-x86_64/lpeg-0.12-makefile.patch
---------------------------------------+
/LICENSE | 14 ++++
/PKGBUILD | 108 ++++++++++++++++++++++++++++++++
/lpeg-0.12-makefile.patch | 74 +++++++++++++++++++++
extra-i686/LICENSE | 7 --
extra-i686/PKGBUILD | 54 ----------------
extra-i686/lpeg-0.12-makefile.patch | 37 ----------
extra-x86_64/LICENSE | 7 --
extra-x86_64/PKGBUILD | 54 ----------------
extra-x86_64/lpeg-0.12-makefile.patch | 37 ----------
9 files changed, 196 insertions(+), 196 deletions(-)
Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE 2014-04-19 12:07:05 UTC (rev 211534)
+++ extra-i686/LICENSE 2014-04-19 12:07:46 UTC (rev 211535)
@@ -1,7 +0,0 @@
-Copyright © 2008 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Copied: lpeg/repos/extra-i686/LICENSE (from rev 211534, lpeg/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2014-04-19 12:07:46 UTC (rev 211535)
@@ -0,0 +1,7 @@
+Copyright © 2008 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-04-19 12:07:05 UTC (rev 211534)
+++ extra-i686/PKGBUILD 2014-04-19 12:07:46 UTC (rev 211535)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Gustavo Alvarez <[email protected]>
-
-pkgbase=lpeg
-pkgname=(lua-lpeg lua51-lpeg)
-pkgver=0.12
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.inf.puc-rio.br/~roberto/lpeg'
-license=('MIT')
-makedepends=('lua' 'lua51')
-source=(http://www.inf.puc-rio.br/~roberto/$pkgbase/$pkgbase-$pkgver.tar.gz
- lpeg-0.12-makefile.patch
- LICENSE)
-md5sums=('4abb3c28cd8b6565c6a65e88f06c9162'
- '75ea7deffd790f482c9473ff2e9e1cdf'
- 'dccb97b431c3a3ccaacc216c6242e9fd')
-
-prepare() {
- pushd $pkgbase-$pkgver
- patch -p1 -i ../lpeg-0.12-makefile.patch
- popd
-
- cp -r $pkgbase-$pkgver $pkgbase-$pkgver-51
-}
-
-build() {
- cd $pkgbase-$pkgver
- make
-
- cd "$srcdir"/$pkgbase-$pkgver-51
- make LUADIR=/usr/include/lua5.1
-}
-
-package_lua-lpeg() {
- pkgdesc='Pattern-matching library for Lua 5.2'
- depends=('lua')
-
- cd $pkgbase-$pkgver
- install -Dm755 $pkgbase.so "$pkgdir"/usr/lib/lua/5.2/$pkgbase.so
- install -Dm644 re.lua "$pkgdir"/usr/share/lua/5.2/re.lua
- install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_lua51-lpeg() {
- pkgdesc='Pattern-matching library for Lua 5.1'
- depends=('lua51')
-
- cd $pkgbase-$pkgver-51
- install -Dm755 $pkgbase.so "$pkgdir"/usr/lib/lua/5.1/$pkgbase.so
- install -Dm644 re.lua "$pkgdir"/usr/share/lua/5.1/re.lua
- install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: lpeg/repos/extra-i686/PKGBUILD (from rev 211534, lpeg/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-04-19 12:07:46 UTC (rev 211535)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer:
+# Contributor: Gustavo Alvarez <[email protected]>
+
+pkgbase=lpeg
+pkgname=(lua-lpeg lua51-lpeg)
+pkgver=0.12
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.inf.puc-rio.br/~roberto/lpeg'
+license=('MIT')
+makedepends=('lua' 'lua51')
+source=(http://www.inf.puc-rio.br/~roberto/$pkgbase/$pkgbase-$pkgver.tar.gz
+ lpeg-0.12-makefile.patch
+ LICENSE)
+md5sums=('4abb3c28cd8b6565c6a65e88f06c9162'
+ '75ea7deffd790f482c9473ff2e9e1cdf'
+ 'dccb97b431c3a3ccaacc216c6242e9fd')
+
+prepare() {
+ pushd $pkgbase-$pkgver
+ patch -p1 -i ../lpeg-0.12-makefile.patch
+ popd
+
+ cp -r $pkgbase-$pkgver $pkgbase-$pkgver-51
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ make LUADIR=/usr/include
+
+ cd "$srcdir"/$pkgbase-$pkgver-51
+ make LUADIR=/usr/include/lua5.1
+}
+
+package_lua-lpeg() {
+ pkgdesc='Pattern-matching library for Lua 5.2'
+ depends=('lua')
+
+ cd $pkgbase-$pkgver
+ install -Dm755 $pkgbase.so "$pkgdir"/usr/lib/lua/5.2/$pkgbase.so
+ install -Dm644 re.lua "$pkgdir"/usr/share/lua/5.2/re.lua
+ install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_lua51-lpeg() {
+ pkgdesc='Pattern-matching library for Lua 5.1'
+ depends=('lua51')
+
+ cd $pkgbase-$pkgver-51
+ install -Dm755 $pkgbase.so "$pkgdir"/usr/lib/lua/5.1/$pkgbase.so
+ install -Dm644 re.lua "$pkgdir"/usr/share/lua/5.1/re.lua
+ install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: extra-i686/lpeg-0.12-makefile.patch
===================================================================
--- extra-i686/lpeg-0.12-makefile.patch 2014-04-19 12:07:05 UTC (rev 211534)
+++ extra-i686/lpeg-0.12-makefile.patch 2014-04-19 12:07:46 UTC (rev 211535)
@@ -1,37 +0,0 @@
---- lpeg-0.12/makefile
-+++ lpeg-0.12/makefile
-@@ -1,7 +1,7 @@
- LIBNAME = lpeg
- LUADIR = /usr/include/lua5.1/
-
--COPT = -O2
-+#COPT = -O2
- # COPT = -DLPEG_DEBUG -g
-
- CWARNS = -Wall -Wextra -pedantic \
-@@ -22,21 +22,21 @@
- # -Wunreachable-code \
-
-
--CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
-+CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
- CC = gcc
-
- FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
-
- # For Linux
- linux:
-- make lpeg.so "DLLFLAGS = -shared -fPIC"
-+ $(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
-
- # For Mac OS
- macosx:
-- make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
-+ $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
-
- lpeg.so: $(FILES)
-- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
-+ env $(CC) $(CFLAGS) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
-
- $(FILES): makefile
-
Copied: lpeg/repos/extra-i686/lpeg-0.12-makefile.patch (from rev 211534,
lpeg/trunk/lpeg-0.12-makefile.patch)
===================================================================
--- extra-i686/lpeg-0.12-makefile.patch (rev 0)
+++ extra-i686/lpeg-0.12-makefile.patch 2014-04-19 12:07:46 UTC (rev 211535)
@@ -0,0 +1,37 @@
+--- lpeg-0.12/makefile
++++ lpeg-0.12/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = /usr/include/lua5.1/
+
+-COPT = -O2
++#COPT = -O2
+ # COPT = -DLPEG_DEBUG -g
+
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,21 +22,21 @@
+ # -Wunreachable-code \
+
+
+-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
+ CC = gcc
+
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+
+ # For Linux
+ linux:
+- make lpeg.so "DLLFLAGS = -shared -fPIC"
++ $(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
+
+ # For Mac OS
+ macosx:
+- make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
++ $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+
+ lpeg.so: $(FILES)
+- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++ env $(CC) $(CFLAGS) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+
+ $(FILES): makefile
+
Deleted: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE 2014-04-19 12:07:05 UTC (rev 211534)
+++ extra-x86_64/LICENSE 2014-04-19 12:07:46 UTC (rev 211535)
@@ -1,7 +0,0 @@
-Copyright © 2008 Lua.org, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Copied: lpeg/repos/extra-x86_64/LICENSE (from rev 211534, lpeg/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE (rev 0)
+++ extra-x86_64/LICENSE 2014-04-19 12:07:46 UTC (rev 211535)
@@ -0,0 +1,7 @@
+Copyright © 2008 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-04-19 12:07:05 UTC (rev 211534)
+++ extra-x86_64/PKGBUILD 2014-04-19 12:07:46 UTC (rev 211535)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Gustavo Alvarez <[email protected]>
-
-pkgbase=lpeg
-pkgname=(lua-lpeg lua51-lpeg)
-pkgver=0.12
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.inf.puc-rio.br/~roberto/lpeg'
-license=('MIT')
-makedepends=('lua' 'lua51')
-source=(http://www.inf.puc-rio.br/~roberto/$pkgbase/$pkgbase-$pkgver.tar.gz
- lpeg-0.12-makefile.patch
- LICENSE)
-md5sums=('4abb3c28cd8b6565c6a65e88f06c9162'
- '75ea7deffd790f482c9473ff2e9e1cdf'
- 'dccb97b431c3a3ccaacc216c6242e9fd')
-
-prepare() {
- pushd $pkgbase-$pkgver
- patch -p1 -i ../lpeg-0.12-makefile.patch
- popd
-
- cp -r $pkgbase-$pkgver $pkgbase-$pkgver-51
-}
-
-build() {
- cd $pkgbase-$pkgver
- make
-
- cd "$srcdir"/$pkgbase-$pkgver-51
- make LUADIR=/usr/include/lua5.1
-}
-
-package_lua-lpeg() {
- pkgdesc='Pattern-matching library for Lua 5.2'
- depends=('lua')
-
- cd $pkgbase-$pkgver
- install -Dm755 $pkgbase.so "$pkgdir"/usr/lib/lua/5.2/$pkgbase.so
- install -Dm644 re.lua "$pkgdir"/usr/share/lua/5.2/re.lua
- install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_lua51-lpeg() {
- pkgdesc='Pattern-matching library for Lua 5.1'
- depends=('lua51')
-
- cd $pkgbase-$pkgver-51
- install -Dm755 $pkgbase.so "$pkgdir"/usr/lib/lua/5.1/$pkgbase.so
- install -Dm644 re.lua "$pkgdir"/usr/share/lua/5.1/re.lua
- install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: lpeg/repos/extra-x86_64/PKGBUILD (from rev 211534, lpeg/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-04-19 12:07:46 UTC (rev 211535)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer:
+# Contributor: Gustavo Alvarez <[email protected]>
+
+pkgbase=lpeg
+pkgname=(lua-lpeg lua51-lpeg)
+pkgver=0.12
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.inf.puc-rio.br/~roberto/lpeg'
+license=('MIT')
+makedepends=('lua' 'lua51')
+source=(http://www.inf.puc-rio.br/~roberto/$pkgbase/$pkgbase-$pkgver.tar.gz
+ lpeg-0.12-makefile.patch
+ LICENSE)
+md5sums=('4abb3c28cd8b6565c6a65e88f06c9162'
+ '75ea7deffd790f482c9473ff2e9e1cdf'
+ 'dccb97b431c3a3ccaacc216c6242e9fd')
+
+prepare() {
+ pushd $pkgbase-$pkgver
+ patch -p1 -i ../lpeg-0.12-makefile.patch
+ popd
+
+ cp -r $pkgbase-$pkgver $pkgbase-$pkgver-51
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ make LUADIR=/usr/include
+
+ cd "$srcdir"/$pkgbase-$pkgver-51
+ make LUADIR=/usr/include/lua5.1
+}
+
+package_lua-lpeg() {
+ pkgdesc='Pattern-matching library for Lua 5.2'
+ depends=('lua')
+
+ cd $pkgbase-$pkgver
+ install -Dm755 $pkgbase.so "$pkgdir"/usr/lib/lua/5.2/$pkgbase.so
+ install -Dm644 re.lua "$pkgdir"/usr/share/lua/5.2/re.lua
+ install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_lua51-lpeg() {
+ pkgdesc='Pattern-matching library for Lua 5.1'
+ depends=('lua51')
+
+ cd $pkgbase-$pkgver-51
+ install -Dm755 $pkgbase.so "$pkgdir"/usr/lib/lua/5.1/$pkgbase.so
+ install -Dm644 re.lua "$pkgdir"/usr/share/lua/5.1/re.lua
+ install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: extra-x86_64/lpeg-0.12-makefile.patch
===================================================================
--- extra-x86_64/lpeg-0.12-makefile.patch 2014-04-19 12:07:05 UTC (rev
211534)
+++ extra-x86_64/lpeg-0.12-makefile.patch 2014-04-19 12:07:46 UTC (rev
211535)
@@ -1,37 +0,0 @@
---- lpeg-0.12/makefile
-+++ lpeg-0.12/makefile
-@@ -1,7 +1,7 @@
- LIBNAME = lpeg
- LUADIR = /usr/include/lua5.1/
-
--COPT = -O2
-+#COPT = -O2
- # COPT = -DLPEG_DEBUG -g
-
- CWARNS = -Wall -Wextra -pedantic \
-@@ -22,21 +22,21 @@
- # -Wunreachable-code \
-
-
--CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
-+CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
- CC = gcc
-
- FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
-
- # For Linux
- linux:
-- make lpeg.so "DLLFLAGS = -shared -fPIC"
-+ $(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
-
- # For Mac OS
- macosx:
-- make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
-+ $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
-
- lpeg.so: $(FILES)
-- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
-+ env $(CC) $(CFLAGS) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
-
- $(FILES): makefile
-
Copied: lpeg/repos/extra-x86_64/lpeg-0.12-makefile.patch (from rev 211534,
lpeg/trunk/lpeg-0.12-makefile.patch)
===================================================================
--- extra-x86_64/lpeg-0.12-makefile.patch (rev 0)
+++ extra-x86_64/lpeg-0.12-makefile.patch 2014-04-19 12:07:46 UTC (rev
211535)
@@ -0,0 +1,37 @@
+--- lpeg-0.12/makefile
++++ lpeg-0.12/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = /usr/include/lua5.1/
+
+-COPT = -O2
++#COPT = -O2
+ # COPT = -DLPEG_DEBUG -g
+
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,21 +22,21 @@
+ # -Wunreachable-code \
+
+
+-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
+ CC = gcc
+
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+
+ # For Linux
+ linux:
+- make lpeg.so "DLLFLAGS = -shared -fPIC"
++ $(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
+
+ # For Mac OS
+ macosx:
+- make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
++ $(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+
+ lpeg.so: $(FILES)
+- env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++ env $(CC) $(CFLAGS) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+
+ $(FILES): makefile
+
