[vlc-devel] commit: manifest files are in srcdir not builddir (Jean-Baptiste Kempf )

git version control git at videolan.org
Sun Nov 30 14:51:04 CET 2008


vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Wed Nov 26 17:20:17 2008 +0100| [abacfd868b0dc96345323ba19a97034207bf0353] | committer: Jean-Baptiste Kempf 

manifest files are in srcdir not builddir
(cherry picked from commit c61844bbd475c42b157dc21ba60e12add0831be6)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=abacfd868b0dc96345323ba19a97034207bf0353
---

 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b92b61b..fb9e2ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -721,7 +721,7 @@ package-win-common:
 if BUILD_MOZILLA
 	mkdir -p "$(win32_destdir)/mozilla"
 	cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
-	cp $(top_builddir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
+	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
 endif
 
 # ActiveX plugin
@@ -732,7 +732,7 @@ if BUILD_ACTIVEX
 	unix2dos $(win32_destdir)/activex/*
 
 	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
-	cp $(top_builddir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
+	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
 endif
 
 # Rebase all those DLLs to speed up loading (need cygwin rebase)




More information about the vlc-devel mailing list