* bootstrap: Fixed an automake breakage when gettext is not present.

[vlc] / install-win32

diff --git a/install-win32 b/install-win32
index 3008ce18301c2194cd65a0288b370f7197eb9434..3af98fa6ed277181afa3f8e15e320c1476882a3e 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -35,7 +35,6 @@ Caption "VLC '${VERSION}' for Win32 Setup"
 \r
 CRCCheck on\r
 \r
-SetShellVarContext all\r
 InstallDir "$PROGRAMFILES\VideoLAN\VLC"\r
 \r
 ; check if the program has already been installed, if so, take this dir\r
@@ -63,29 +62,30 @@ Section "Install"
        File  vlc.exe\r
        File  *.txt\r
 \r
-       File  /r share\r
        File  /r plugins\r
        File  /r locale\r
        File  /r skins\r
+       File  /r http\r
+       File  /r mozilla\r
+\r
+        SetShellVarContext all\r
 \r
        CreateDirectory "$SMPROGRAMS\VideoLAN"\r
        CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" \\r
                        "$INSTDIR\vlc.exe" "--intf wxwin"\r
        CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \\r
                        "$INSTDIR\vlc.exe" "--intf skins"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (custom).lnk" \\r
-                       "$INSTDIR\vlc.exe" \r
 \r
         WriteRegStr HKLM \\r
             SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
-            "DisplayName" "VideoLAN VLC media player"\r
+            "DisplayName" "VideoLAN VLC media player ${VERSION}"\r
         WriteRegStr HKLM \\r
             SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
             "UninstallString" '"$INSTDIR\uninstall.exe"'\r
        WriteUninstaller "uninstall.exe"\r
 \r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" $INSTDIR\r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "${VERSION}"\r
+       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "InstallDir" $INSTDIR\r
+       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Version" "${VERSION}"\r
 \r
        Exec "explorer $SMPROGRAMS\VideoLAN\"\r
 SectionEnd\r
@@ -95,6 +95,7 @@ SectionEnd
 ;;;;;;;;;;;;;;;;;;;;;;\r
 \r
 Section "Uninstall"\r
+        SetShellVarContext all\r
        RMDir /r $SMPROGRAMS\VideoLAN\r
        RMDir /r $INSTDIR\r
        DeleteRegKey HKLM SOFTWARE\VideoLAN\r