Fixes related to [3695af464c9cd9ee124]

diff --git a/Makefile.am b/Makefile.am
index 97fbfd87d01660bd811b293a0deec04c25d2f5fa..a351c84a6ec094c603e6df0851ffd8a7d781f6ad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,7 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/InfoPlist.strings \
+       extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
        extras/package/macosx/Resources/a52.icns \
        extras/package/macosx/Resources/aac.icns \
        extras/package/macosx/Resources/asf.icns \
@@ -255,11 +255,11 @@ EXTRA_DIST += \
        extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \
        extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \
        extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
-       extras/package/macosx/plugin/Info.plist \
-       extras/package/macosx/plugin/InstallerInfo.plist \
+       extras/package/macosx/plugin/Info.plist.in \
+       extras/package/macosx/plugin/InstallerInfo.plist.in \
        extras/package/macosx/plugin/InstallerDescription.plist \
        extras/package/macosx/plugin/pbdevelopment.plist \
-       extras/package/macosx/plugin/English.lproj/InfoPlist.strings \
+       extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \
        extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
        extras/package/macosx/eyetvplugin/Info.plist \
        extras/package/macosx/eyetvplugin/eyetvplugin.c \
@@ -267,7 +267,7 @@ EXTRA_DIST += \
        extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
        extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
        extras/package/macosx/README.MacOSX.rtf \
-       extras/package/macosx/Info.plist
+       extras/package/macosx/Info.plist.in
 
 
 ###############################################################################
@@ -400,9 +400,12 @@ VLC-release.app: vlc
        rm -Rf "$(top_builddir)/tmp"
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC-release.app
-       for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
+       for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
+       for i in  Resources Info.plist; do \
+         cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+       done
        for i in AUTHORS COPYING THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -558,9 +561,12 @@ VLC.app: vlc
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app
-       for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
+       for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
+       for i in  Resources Info.plist; do \
+         cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+       done
        for i in AUTHORS COPYING THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done

diff --git a/configure.ac b/configure.ac
index c3522b03dddcf9082e67df4bcd3d64ba4fc152fa..78d05ba23f17d7dc896a29fc59797168e8b41e79 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5797,6 +5797,7 @@ AC_CONFIG_FILES([
   extras/package/macosx/Resources/English.lproj/InfoPlist.strings
   extras/package/macosx/plugin/Info.plist
   extras/package/macosx/plugin/InstallerInfo.plist
+  extras/package/macosx/plugin/English.lproj/InfoPlist.strings
   Makefile
   projects/activex/Makefile
   projects/activex/axvlc.inf

diff --git a/extras/package/macosx/plugin/English.lproj/InfoPlist.strings b/extras/package/macosx/plugin/English.lproj/InfoPlist.strings
deleted file mode 100644 (file)
index 5baf2ea..0000000
Binary files a/extras/package/macosx/plugin/English.lproj/InfoPlist.strings and /dev/null differ

diff --git a/extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in b/extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in
new file mode 100644 (file)
index 0000000..6014abd
Binary files /dev/null and b/extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in differ

diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am
index b6f0213dba48892a42c9617841156e3730387968..1cac82272cd019d29bcbadb50b2c7996120e62ff 100644 (file)
--- a/projects/mozilla/Makefile.am
+++ b/projects/mozilla/Makefile.am
@@ -128,7 +128,8 @@ VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
        $(INSTALL) -d "$@/Contents/Resources"
        $(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc"
        cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
-       $(INSTALL) "$(top_srcdir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist"
+       cp -r "$(top_builddir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/"
+       $(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist"
        $(INSTALL) -d "$@/Contents/MacOS/modules"
        find $(top_srcdir)/modules/ -name '*_plugin.$(LIBEXT)' | \
        while read i; do \