* final version of the Simplified Chinese translation by Wei Mingzhi and King Norman...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 76f7d605ac6c4de9ec7f2c81ffefb0995d02d209..437a9d22974439a26df9cc03be80196d14694bc1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@ DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib
 EXTRA_DIST = \
        HACKING \
        INSTALL.win32 \
+       INSTALL.wince \
        vlc.exe.manifest \
        MAINTAINERS \
        README.MacOSX.rtf \
@@ -180,9 +181,9 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
+#      extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
+#      extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
+#      extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
@@ -608,8 +609,6 @@ VLC-release.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           update.h \
-           update.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -724,8 +723,6 @@ VLC.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           update.h \
-           update.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -855,52 +852,21 @@ package-win32-base:
        done
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume"
-       for i in $(srcdir)/share/osdmenu/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/ || true ; \
-         unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \
-       done
-
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selected"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selection"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/volume"
-       for i in $(srcdir)/share/osdmenu/default/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/volume/ || true ; \
+       cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
+       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
+               mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
+               for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
+                        cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
+               done; \
        done
+       unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
+       sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
+       sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;:
        cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
        cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
@@ -1099,7 +1065,7 @@ package-macosx:
 
 # Copy relevant files 
        cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
-       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
+       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -r extras/MacOSX/Delete\ Preferences.app $(top_builddir)/tmp/
 
 # Create disk image 
        $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp