[vlc-commits] macosx: Do not generate InfoPlist.strings anymore

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sat Oct 17 12:46:52 2020 +0200| [f233f85df706b7648946c6ef28a41cd92e40173a] | committer: David Fuhrmann

macosx: Do not generate InfoPlist.strings anymore

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

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

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

diff --git a/configure.ac b/configure.ac
index 1f74566008..376f5200e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4373,7 +4373,6 @@ AM_COND_IF([HAVE_WIN32], [
 
 AM_COND_IF([HAVE_DARWIN], [
   AC_CONFIG_FILES([
-    modules/gui/macosx/UI/InfoPlist.strings:modules/gui/macosx/Resources/InfoPlist.strings.in
     share/macosx/Info.plist:share/Info.plist.in
   ])
 ])
diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
index 2d6b3ff962..db3fb18e5a 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -17,7 +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 -R "$(top_builddir)/modules/gui/macosx/UI" $@/Contents/Resources/Base.lproj
+	cp "$(srcdir)/modules/gui/macosx/Resources/InfoPlist.strings" $@/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 eed481e31a..70b1985dcc 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -739,6 +739,9 @@ libmacosx_plugin_la_RES += \
 	gui/macosx/Resources/vlc.scriptSuite \
 	gui/macosx/Resources/vlc.scriptTerminology
 
+libmacosx_plugin_la_RES += \
+	gui/macosx/Resources/InfoPlist.strings
+
 if ENABLE_MACOSX_UI
 dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES)
 endif
diff --git a/modules/gui/macosx/Resources/InfoPlist.strings.in b/modules/gui/macosx/Resources/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/InfoPlist.strings.in
rename to modules/gui/macosx/Resources/InfoPlist.strings