* Makefile.am, install-win32: removed rle fonts from the win32 package and added...
authorGildas Bazin <gbazin@videolan.org>
Mon, 21 Jul 2003 17:29:58 +0000 (17:29 +0000)
committerGildas Bazin <gbazin@videolan.org>
Mon, 21 Jul 2003 17:29:58 +0000 (17:29 +0000)
Makefile.am
install-win32

index 564dcf7..c67e693 100644 (file)
@@ -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
index 9449c4c..934ab69 100644 (file)
@@ -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