[vlc-commits] macOS package: Install InfoPlist.strings for different langs

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Dec  2 19:53:31 2020 +0100| [bc51dbbcda9e4c7960d4bc659e69a5c1aebab4e2] | committer: David Fuhrmann

macOS package: Install InfoPlist.strings for different langs

Also, move the template file, InfoPlist.strings, into Base.lproj
to simplify the install rules.

(cherry picked from commit 5b6d90bada44fc99ca0adf029d5ba5df5a496ae4)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>

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

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

diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index db3fb18e5a..0aca811b67 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -17,8 +17,8 @@ VLC.app: install
 	## Copy Contents
 	cp -R $(prefix)/share/macosx/ $@
 	## Copy .strings file and .nib files
-	cp -R "$(top_builddir)/modules/gui/macosx/UI" $@/Contents/Resources/Base.lproj
-	cp "$(srcdir)/modules/gui/macosx/Resources/InfoPlist.strings" $@/Contents/Resources/Base.lproj/
+	cp -R "$(srcdir)/modules/gui/macosx/Resources/"*.lproj $@/Contents/Resources/
+	cp -R "$(top_builddir)/modules/gui/macosx/UI/." $@/Contents/Resources/Base.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 70b1985dcc..06f52d7e10 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
 
 libmacosx_plugin_la_RES += \
-	gui/macosx/Resources/InfoPlist.strings
+	gui/macosx/Resources/Base.lproj/InfoPlist.strings
 
 if ENABLE_MACOSX_UI
 dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES)
diff --git a/modules/gui/macosx/Resources/InfoPlist.strings b/modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/InfoPlist.strings
rename to modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings