[vlc-devel] [PATCH] contribs: bootstrap: allow config.mak override file

[Marvin Scholz]

LGTM

On 9 Oct 2019, at 23:35, Alexandre Janniaux wrote:

> The file is optional but is still used by ports and needed to avoid
> using global environment configuration variables in build scripts.
> ---
>  contrib/bootstrap | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/contrib/bootstrap b/contrib/bootstrap
> index 577d8b0dc6..01a234e55c 100755
> --- a/contrib/bootstrap
> +++ b/contrib/bootstrap
> @@ -362,6 +362,7 @@ TOPSRC_BUILT=$(python3 -c "import os; 
> print(os.path.relpath('$BOOTSTRAP_PATH', '
>  add_make "TOPSRC = $TOPSRC"
>  add_make "TOPSRC_BUILT = $TOPSRC_BUILT"
>  add_make "TOPDST = .."
> +add_make "-include config.mak"
>  add_make 'include $(TOPSRC)/src/main.mak'
>  echo "Bootstrap completed."
>  make help
> -- 
> 2.23.0
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel