X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=0db63252113f06315f30fe1510020700d781b5cf;hb=f0dfd71b45c7f6b8625841941644a7fdea9fd457;hp=971050db9fd934280b424a2c96d6d15bb3d2537d;hpb=41e5bcdaf199d62d6bd5a6c0866ecce61458820e;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 971050db9f..0db6325211 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -471,7 +471,7 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-        xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+	xcodebuild install -nobonjourbuildhosts -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
 	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
@@ -624,7 +624,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
              $(top_builddir)/tmp/modules/gui/macosx; \
 	done
 	$(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-	xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+	xcodebuild install -nobonjourbuildhosts -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
 	cd ../../../../ && \
 	cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
@@ -662,7 +662,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 destdir=$(prefix)
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
 win32_debugdir=$(top_builddir)/symbols-$(VERSION)
-win32_lua_destdir=$(win32_destdir)/lua
 win32_xpi_destdir=$(win32_destdir)/vlc-plugin
 
 if HAVE_WIN64
@@ -722,51 +721,9 @@ package-win-common: install build-npapi build-activex
 	cp -r $(destdir)/lib/vlc/plugins $(win32_destdir)
 
 if BUILD_LUA
-# Copy the lua scripts (HTTP)
-	mkdir -p $(win32_lua_destdir)
-	cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http"
-
-# Lua Scripts - cannot be simplified yet, because make install doesn't install READMEs
-	$(INSTALL) -d $(win32_lua_destdir)
-	for i in $(srcdir)/share/lua/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/modules
-	for i in $(srcdir)/share/lua/modules/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/extensions
-	for i in $(srcdir)/share/lua/extensions/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/intf
-	for i in $(srcdir)/share/lua/intf/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/intf/modules
-	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta/art
-	for i in $(srcdir)/share/lua/meta/art/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta/fetcher
-	for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta/reader
-	for i in $(srcdir)/share/lua/meta/reader/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/playlist
-	for i in $(srcdir)/share/lua/playlist/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/sd
-	for i in $(srcdir)/share/lua/sd/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
-	done
+	mkdir -p $(win32_destdir)/lua
+	cp -r $(destdir)/lib/vlc/lua/* $(win32_destdir)/lua
+	cp -r $(destdir)/share/vlc/lua/* $(win32_destdir)/lua
 endif
 
 if BUILD_HTTPD
@@ -812,6 +769,7 @@ endif
 if USE_PEFLAGS
 	find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
 endif
+	find $(win32_destdir) -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rf {} \;
 
 package-win-base: package-win-common
 	find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \