* updated the "package-win32" rule

* all txt files are now converted to dos format (CRLF)

diff --git a/Makefile b/Makefile
index 33c66bf64af8d1123e0e7b155bd8fdd7f27865da..1de7c112561d8a90415d17c2d5cb806eb81224bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -435,8 +435,11 @@ package-win32:
        sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
        # Copy relevant files
        cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/ 
-       cp INSTALL-win32.txt AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
-               README README.libdvdcss FAQ TODO tmp/
+       cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
+       for file in AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
+               README README.libdvdcss FAQ TODO ; \
+                       do cp $$file tmp/$${file}.txt ; \
+                       unix2dos tmp/$${file}.txt ; done
        for file in iconv.dll libgmodule-1.3-12.dll libgtk-0.dll libgdk-0.dll \
                libgobject-1.3-12.dll libintl-1.dll libglib-1.3-12.dll \
                libgthread-1.3-12.dll SDL.dll README-SDL.txt ; \

diff --git a/install-win32 b/install-win32
index c5fc17e2bab55d1d67088f5c19c323e1f24fef80..10183afe69a536c171f046db38ec2277ea73f87a 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -54,15 +54,6 @@ Section "Install"
        File  *.dll\r
        File  *.txt\r
 \r
-       File  AUTHORS\r
-       File  COPYING\r
-       File  ChangeLog\r
-       File  ChangeLog.libdvdcss\r
-       File  README\r
-       File  README.libdvdcss\r
-       File  FAQ\r
-       File  TODO\r
-\r
        File  /r share\r
 \r
        CreateDirectory "$SMPROGRAMS\VideoLAN"\r