Commit 3fb49d5d authored by Damien Fouilleul's avatar Damien Fouilleul

Makefile.am: fix package-win32 to use libtool libs location

parent 51681a24
......@@ -641,9 +641,9 @@ package-win-common:
fi
# Copy relevant files
cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/"
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
......@@ -698,7 +698,7 @@ package-win-common:
if BUILD_MOZILLA
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
cp $(top_builddir)/mozilla/.libs/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
endif
if BUILD_ACTIVEX
......@@ -707,7 +707,7 @@ if BUILD_ACTIVEX
cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
cp $(top_builddir)/activex/.libs/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
endif
# Rebase all those DLLs to speed up loading (need cygwin rebase)
if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
......@@ -731,7 +731,7 @@ package-win32-base-debug: package-win-common
mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins"
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
$(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \
$(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
"$(top_builddir)/vlc-${VERSION}/plugins/" ; \
fi ; done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment