[vlc-commits] contrib: merge config.mak into the local build Makefile

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Mar  5 09:46:57 2019 +0100| [42c145b66a0692530ec66b1e284fcbe2cd5a8e65] | committer: Steve Lhomme

contrib: merge config.mak into the local build Makefile

Editing main.mak requires a bootstrap call on Windows because ln -s makes a
hard copy of the file. With a local Makefile we can make changes and they are
used right away as on other platforms.

(cherry picked from commit 282c1827126668442ece5819ac91de4755876b04)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/bootstrap    | 10 ++++++----
 contrib/src/main.mak |  5 -----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 611912a14a..1171cc6acb 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -164,8 +164,9 @@ fi
 #
 # Prepare files
 #
-echo "Creating configuration file... config.mak"
-exec 3>config.mak || exit $?
+echo "Creating makefile..."
+test -e Makefile && unlink Makefile
+exec 3>Makefile || exit $?
 cat >&3 << EOF
 # This file was automatically generated.
 # Any change will be overwritten if ../bootstrap is run again.
@@ -398,8 +399,9 @@ esac
 #
 # Results output
 #
-test -e Makefile && unlink Makefile
-ln -sf ../../contrib/src/main.mak Makefile || exit $?
+echo TOPSRC = .. >> Makefile
+echo TOPDST = . >> Makefile
+echo include $\(TOPSRC\)/src/main.mak >> Makefile
 echo "Bootstrap completed."
 make help
 mkdir -p ../../contrib/tarballs || exit $?
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 7c223f663c..b88a9b1184 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -5,11 +5,6 @@
 
 all: install
 
-# bootstrap configuration
-include config.mak
-
-TOPSRC ?= ../../contrib
-TOPDST ?= ..
 SRC := $(TOPSRC)/src
 TARBALLS := $(TOPSRC)/tarballs