vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jan 21 18:06:06 2016 +0100| [ac56a06195c2292c8d2c25be13e8a99e5daea0db] | committer: Jean-Baptiste Kempf
win32: avoid copying files we'll remove later Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ac56a06195c2292c8d2c25be13e8a99e5daea0db --- extras/package/win32/package.mak | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak index 8402b50..b3e69fc 100644 --- a/extras/package/win32/package.mak +++ b/extras/package/win32/package.mak @@ -42,7 +42,8 @@ package-win-common: package-win-install done cp $(srcdir)/share/icons/vlc.ico $(win32_destdir) - cp -r $(prefix)/lib/vlc/plugins $(win32_destdir) + mkdir -p "$(win32_destdir)"/plugins + (cd $(prefix)/lib/vlc/plugins/ && find . -type f \( -not -name '*.la' -and -not -name '*.a' \) -exec cp -v --parents "{}" "$(win32_destdir)/plugins/" \;) -cp -r $(prefix)/share/locale $(win32_destdir) # BD-J JAR @@ -85,9 +86,6 @@ endif # Convert to DOS line endings find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \; -# Remove cruft - find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \; - package-win-npapi: build-npapi cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
