vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Tue 
Dec 15 22:29:29 2020 +0100| [a1d577518d6665ba0567f9f5b0b2176e111da37f] | 
committer: David Fuhrmann

macosx: Move Base.lproj back to English.lproj

Base.lproj is not recognised yet as a known directory on 10.7.
This seems to be supported only for 10.8 and later.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a1d577518d6665ba0567f9f5b0b2176e111da37f
---

 extras/package/macosx/package.mak                                       | 2 +-
 modules/gui/macosx/Makefile.am                                          | 2 +-
 .../macosx/Resources/{Base.lproj => English.lproj}/InfoPlist.strings    | 0
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/package/macosx/package.mak 
b/extras/package/macosx/package.mak
index 3e95760be6..21ab36cf71 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -18,7 +18,7 @@ VLC.app: install
        cp -R $(prefix)/share/macosx/ $@
        ## Copy .strings file and .nib files
        cp -R "$(srcdir)/modules/gui/macosx/Resources/"*.lproj 
$@/Contents/Resources/
-       cp -R "$(top_builddir)/modules/gui/macosx/UI/." 
$@/Contents/Resources/Base.lproj/
+       cp -R "$(top_builddir)/modules/gui/macosx/UI/." 
$@/Contents/Resources/English.lproj/
        ## Copy Info.plist and convert to binary
        cp -R $(top_builddir)/share/macosx/Info.plist $@/Contents/
        xcrun plutil -convert binary1 $@/Contents/Info.plist
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 99bb7df691..87d8bcb97e 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -740,7 +740,7 @@ libmacosx_plugin_la_RES += \
        gui/macosx/Resources/vlc.scriptTerminology
 
 EXTRA_DIST += \
-       gui/macosx/Resources/Base.lproj/InfoPlist.strings \
+       gui/macosx/Resources/English.lproj/InfoPlist.strings \
        gui/macosx/Resources/ar.lproj/InfoPlist.strings \
        gui/macosx/Resources/bg.lproj/InfoPlist.strings \
        gui/macosx/Resources/ca.lproj/InfoPlist.strings \
diff --git a/modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings 
b/modules/gui/macosx/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings
rename to modules/gui/macosx/Resources/English.lproj/InfoPlist.strings

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to