X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=6cb20d6645ae4abac12758c1532fd738c3c853cf;hb=86c8ef3fb275c71baed5a1e1c43624c813b1193c;hp=dc3abd7eb4eb155d2c77a5a920d5a61a2ac39bbb;hpb=b945b839b55ec25e6dd6abcfcbd562c886829a71;p=vlc

diff --git a/Makefile.am b/Makefile.am
index dc3abd7eb4..6cb20d6645 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 -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 -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
@@ -721,7 +721,9 @@ package-win-common: install build-npapi build-activex
 	cp -r $(destdir)/lib/vlc/plugins $(win32_destdir)
 
 if BUILD_LUA
-	cp -r $(destdir)/share/vlc/lua $(win32_destdir)
+	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
@@ -752,7 +754,7 @@ endif
 	cp -r $(destdir)/include "$(win32_destdir)/sdk"
 	cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
 	for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \
-        cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
+        cp -rv $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
 if !HAVE_WIN64
 if !HAVE_WINCE
 	mkdir -p "$(win32_destdir)/sdk/activex"
@@ -767,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)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \;
 
 package-win-base: package-win-common
 	find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \