From 5111521d53ec968f1b6f3e004bf8336e17601f05 Mon Sep 17 00:00:00 2001 From: Eric Lassauge Date: Wed, 10 Mar 2010 18:32:34 +0100 Subject: [PATCH] Win32: don't rebase UAC.dll Signed-off-by: Geoffroy Couprie --- Makefile.am | 9 +++++---- extras/package/win32/vlc.win32.nsi.in | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index a87e20845d..355d8d34ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -727,10 +727,6 @@ 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" @@ -753,6 +749,11 @@ endif find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ fi +# Copy the UAC NSIS plugin + mkdir -p "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS" + cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS" + package-win32-xpi: package-win-common-strip mkdir -p "$(win32_xpi_destdir)/plugins" cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)" diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in index 6798b4834c..051b387966 100644 --- a/extras/package/win32/vlc.win32.nsi.in +++ b/extras/package/win32/vlc.win32.nsi.in @@ -49,8 +49,8 @@ InstType $Name_InstTypeMinimum InstType $Name_InstTypeFull RequestExecutionLevel user -!addincludedir . -!addplugindir . +!addincludedir NSIS +!addplugindir NSIS !include UAC.nsh ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -- 2.39.2