[vlc-commits] commit: Win32: no need for activex and mozilla folder. ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jul  3 16:17:07 2010 +0200| [a0761fb15104e7120ed69de9da0a0c7d491ce27b] | committer: Jean-Baptiste Kempf 

Win32: no need for activex and mozilla folder.

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

 Makefile.am                           |   16 ++++++++--------
 extras/package/win32/vlc.win32.nsi.in |    8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 94485d5..9a33c3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -803,16 +803,12 @@ if BUILD_OSDMENU
 	done
 endif
 if BUILD_MOZILLA
-	mkdir -p "$(win32_destdir)/mozilla"
-	cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
-	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
+	cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)
+	cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)
 endif
 if BUILD_ACTIVEX
-	mkdir -p "$(win32_destdir)/activex"
-	cp $(srcdir)/projects/activex/README.TXT  $(win32_destdir)/activex/
-	cp $(srcdir)/projects/activex/test.html  $(win32_destdir)/activex/
-	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
-	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
+	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)
+	cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)
 endif
 
 # SDK
@@ -822,6 +818,10 @@ endif
 	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
+if BUILD_ACTIVEX
+	cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/sdk/
+	cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/
+endif
 
 	find $(win32_destdir) -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*lua' -exec unix2dos {} \;
 
diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 60d6f23..82e5087 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -608,8 +608,8 @@ Section /o $Name_Section03 SEC03
 
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
-  !insertmacro InstallFile mozilla\npvlc.dll
-  !insertmacro InstallFile mozilla\npvlc.dll.manifest
+  !insertmacro InstallFile npvlc.dll
+  !insertmacro InstallFile npvlc.dll.manifest
   !insertmacro CloseUninstallLog
 
   !define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
@@ -627,8 +627,8 @@ Section $Name_Section04 SEC04
 
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
-  !insertmacro InstallFile activex\axvlc.dll
-  !insertmacro InstallFile activex\axvlc.dll.manifest
+  !insertmacro InstallFile axvlc.dll
+  !insertmacro InstallFile axvlc.dll.manifest
   !insertmacro CloseUninstallLog
   RegDLL "$INSTDIR\axvlc.dll"
 SectionEnd