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

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Wed Oct  9 23:35:09 2019 +0200| [9234532d61ba5df14b7fd8423fc55e8d3a6630ca] | committer: Marvin Scholz

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.

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

 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