Builds correctly lua for windows

Distributes luaplaylist scripts with windows packages

diff --git a/Makefile.am b/Makefile.am
index 3d99d8c8949119ef7976f5eb0bafcdd4a57633e5..d51d15c68a017b555028be4206aa0fedcf403375 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -729,6 +729,11 @@ package-win32-base-debug: package-win-common
          cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
        done
 
+        $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaplaylist
+        for i in $(srcdir)/share/luaplaylist/*.* ; do \
+          $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \
+        done ; \
+
        mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
        for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0d98d2884b287c6e46869565bdde3e768408533a..4e1a0f769f41e42b4ca088a185ab255edaace433 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -578,7 +578,8 @@ lua: lua-$(LUA_VERSION).tar.gz
 .lua: lua
 ifdef HAVE_WIN32
        ( cd $<; sed -i.orig 's/lua luac/lua.exe/' Makefile ; cd src; sed -i.orig 's/CC=/#CC=/' Makefile; cd ../..;)
-       (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX))
+       (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM); cd src; $(HOSTCC) make liblua.a; cd ..;$(HOSTCC) make install INSTALL_TOP=$(PREFIX); $(RANLIB) $(PREFIX)/lib/liblua.a)
+       (cd $<; sed -i.orig 's@prefix= /usr/local@prefix= $(PREFIX)@' etc/lua.pc; mkdir -p $(PREFIX)/lib/pkgconfig; cp etc/lua.pc $(PREFIX)/lib/pkgconfig)
 else 
        (cd $<; $(HOSTCC) make $(LUA_MAKEPLATEFORM) && make install INSTALL_TOP=$(PREFIX))
 endif