* Makefile.am, install-win32: removed rle fonts from the win32 package and added...

diff --git a/Makefile.am b/Makefile.am
index 564dcf76b5a39847e513b06776b7b4c6307f4977..c67e693738794b946befab510b0780786a8b7a68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -480,9 +480,6 @@ package-win32:
        for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
-       mkdir -p "$(srcdir)/tmp/share"
-       cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
-
        mkdir $(srcdir)/tmp/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
@@ -498,6 +495,11 @@ package-win32:
          cp $$i $(srcdir)/tmp/skins/ || true ; \
        done
 
+       mkdir -p "$(srcdir)/tmp/http/admin"
+       cp $(srcdir)/share/http/*.html $(srcdir)/tmp/http/ ;
+       cp $(srcdir)/share/http/admin/*.html $(srcdir)/tmp/http/admin/ ;
+       cp $(srcdir)/share/http/admin/.access $(srcdir)/tmp/http/admin/ ;
+
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
 # Clean up

diff --git a/install-win32 b/install-win32
index 9449c4c0d902b7e55858f36f9f327b60b429fefa..934ab6948d808c61eb7f9277bcd7af17747db6d1 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -62,10 +62,10 @@ 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
 \r
         SetShellVarContext all\r
 \r
@@ -79,7 +79,7 @@ Section "Install"
 \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