From: Geoffroy Couprie <geal@videolan.org>
Date: Mon, 8 Mar 2010 12:12:57 +0000 (+0100)
Subject: Win32: UAC.dll must be packaged while doing package-win32-base-exe
X-Git-Tag: 1.1.0-pre1~446
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=44fb88bf44e59febfa60ac9ca3ff9ff484ecbaf6;p=vlc

Win32: UAC.dll must be packaged while doing package-win32-base-exe
---

diff --git a/Makefile.am b/Makefile.am
index d4ad59e62b..a87e20845d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -727,6 +727,10 @@ package-win-common:
 	mkdir -p $(win32_destdir)/locale/qt4/
 	cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true
 
+# Copy the UAC NSIS plugin
+	cp "$(srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/"
+	cp "$(srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/"
+
 #  Mozilla plugin
 if BUILD_MOZILLA
 	mkdir -p "$(win32_destdir)/mozilla"
@@ -774,8 +778,6 @@ package-win32-base-debug: package-win-common
 # Script installer
 	cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
 	cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/"
-	cp "$(srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/"
-	cp "$(srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/"
 	mkdir "$(win32_destdir)/languages"
 	cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"