[vlc-devel] [VLC 3.x 1/2] package/macosx: Fix bundling when locales are missing

[Marvin Scholz]

On 22 Apr 2021, at 17:54, David Fuhrmann wrote:

>> Am 22.04.2021 um 17:43 schrieb Marvin Scholz <epirat07 at gmail.com>:
>>
>> ---
>> extras/package/macosx/package.mak | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/extras/package/macosx/package.mak 
>> b/extras/package/macosx/package.mak
>> index 21ab36cf71..7bf7b7dcda 100644
>> --- a/extras/package/macosx/package.mak
>> +++ b/extras/package/macosx/package.mak
>> @@ -43,7 +43,7 @@ endif
>> 	mkdir -p $@/Contents/MacOS/include/
>> 	(cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) | 
>> $(AMTAR) -x -C $@/Contents/MacOS/include/
>> 	## Copy translations
>> -	cp -r "$(prefix)/share/locale" $@/Contents/MacOS/share/
>> +	[ -d "$(prefix)/share/locale" ] && cp -r "$(prefix)/share/locale" 
>> $@/Contents/MacOS/share/ || true
>
> I think the far easier way would be to prefix with ‚-', i.e.
>
> -cp -r "$(prefix)/share/locale" $@/Contents/MacOS/share/

Indeed thats probably simpler, thanks.

>
> Why would share be ever empty, though?

It's not share being empty, is locale folder not existing.
This apparently can happen if using --disable-nls.

>
>> 	printf "APPLVLC#" >| $@/Contents/PkgInfo
>> 	## Copy libs
>> 	mkdir -p $@/Contents/MacOS/lib
>> -- 
>> 2.30.1
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel