diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/lua/patches/patch-src_Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/lua/patches/patch-src_Makefile')
| -rw-r--r-- | package/lua/patches/patch-src_Makefile | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/package/lua/patches/patch-src_Makefile b/package/lua/patches/patch-src_Makefile new file mode 100644 index 000000000..59179c379 --- /dev/null +++ b/package/lua/patches/patch-src_Makefile @@ -0,0 +1,16 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- lua-5.1.4.orig/src/Makefile 2008-01-19 20:37:58.000000000 +0100 ++++ lua-5.1.4/src/Makefile 2009-05-29 23:41:06.936423384 +0200 +@@ -14,15 +14,16 @@ RANLIB= ranlib + RM= rm -f + LIBS= -lm $(MYLIBS) + +-MYCFLAGS= +-MYLDFLAGS= +-MYLIBS= ++MYCFLAGS?= ++MYLDFLAGS?= ++MYLIBS?= + + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= + |