[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[virt-tools-list] [PATCH virt-viewer 4/5] nsis: fix .nsis file paths



- look up for icons under the DESTDIR directory
- don't ship gstaudiofx, unneeded
- add missing libtasn
---
 data/virt-viewer.nsis.in |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in
index 68a6a21..e438159 100644
--- a/data/virt-viewer.nsis.in
+++ b/data/virt-viewer.nsis.in
@@ -103,6 +103,7 @@ Section "VirtViewer"
   File "@prefix@/bin/libspice-client-gtk-2.0-1.dll"
   File "@prefix@/bin/libspice-controller-0.dll"
   File "@prefix@/bin/libssl-10.dll"
+  File "@prefix@/bin/libtasn1-3.dll"
   File "@prefix@/bin/libxml2-2.dll"
   File "@prefix@/bin/libp11-kit-0.dll"
   File "@prefix@/bin/libssh2-1.dll"
@@ -145,7 +146,6 @@ Section "VirtViewer"
   SetOutPath "$INSTDIR\lib\gstreamer-0.10"
   File "@prefix@/lib/gstreamer-0.10/libgstapp.dll"
   File "@prefix@/lib/gstreamer-0.10/libgstaudioconvert.dll"
-  File "@prefix@/lib/gstreamer-0.10/libgstaudiofx.dll"
   File "@prefix@/lib/gstreamer-0.10/libgstaudiorate.dll"
   File "@prefix@/lib/gstreamer-0.10/libgstaudioresample.dll"
   File "@prefix@/lib/gstreamer-0.10/libgstaudiotestsrc.dll"
@@ -178,12 +178,12 @@ Section "VirtViewer"
   File "/usr/share/icons/hicolor/index.theme"
 
   SetOutPath "$INSTDIR\share\icons\hicolor\16x16\apps"
-  File "@prefix@/share/icons/hicolor/16x16/apps/virt-viewer.png"
+  File "${DESTDIR} prefix@/share/icons/hicolor/16x16/apps/virt-viewer.png"
   File "/usr/share/icons/gnome/16x16/apps/preferences-desktop-keyboard-shortcuts.png"
   SetOutPath "$INSTDIR\share\icons\hicolor\32x32\apps"
-  File "@prefix@/share/icons/hicolor/32x32/apps/virt-viewer.png"
+  File "${DESTDIR} prefix@/share/icons/hicolor/32x32/apps/virt-viewer.png"
   SetOutPath "$INSTDIR\share\icons\hicolor\48x48\apps"
-  File "@prefix@/share/icons/hicolor/48x48/apps/virt-viewer.png"
+  File "${DESTDIR} prefix@/share/icons/hicolor/48x48/apps/virt-viewer.png"
 
   ReadEnvStr $0 COMSPEC
   SetOutPath "$INSTDIR"
@@ -228,7 +228,6 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiotestsrc.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioresample.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiorate.dll"
-  Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudiofx.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioconvert.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstapp.dll"
   RMDir "$INSTDIR\lib\gstreamer-0.10"
@@ -265,6 +264,7 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\zlib1.dll"
   Delete /rebootok "$INSTDIR\bin\libp11-kit-0.dll"
   Delete /rebootok "$INSTDIR\bin\libxml2-2.dll"
+  Delete /rebootok "$INSTDIR\bin\libtasn1-3.dll"
   Delete /rebootok "$INSTDIR\bin\libssl-10.dll"
   Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-1.dll"
   Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-1.dll"
-- 
1.7.10.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]