vlc/vlc-3.0 | branch: master | Alexandre Janniaux <[email protected]> | Wed Oct 9 23:35:09 2019 +0200| [d5531cfcacf01858e0a051e96594fa96f142df58] | committer: Steve Lhomme
contribs: bootstrap: allow config.mak override file The file is optional but is still used by ports and needed to avoid using global environment configuration variables in build scripts. (cherry picked from commit 9234532d61ba5df14b7fd8423fc55e8d3a6630ca) Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d5531cfcacf01858e0a051e96594fa96f142df58 --- contrib/bootstrap | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/bootstrap b/contrib/bootstrap index 2153b7cb2c..980b1f9e49 100755 --- a/contrib/bootstrap +++ b/contrib/bootstrap @@ -403,6 +403,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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
