vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jul 6 12:18:06 2011 +0300| [03bbc76fc861d65aa4083c63689ae13cfd07529e] | committer: Rémi Denis-Courmont
contrib: do not create host directories from bootstrap 'make clean' removes those, so there is no point in creating them from bootstrap. $(RECONF) takes care of this better already for aclocal. Otherwise, install targets should deal with this. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=03bbc76fc861d65aa4083c63689ae13cfd07529e --- contrib/bootstrap | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/contrib/bootstrap b/contrib/bootstrap index 024ead9..d279666 100755 --- a/contrib/bootstrap +++ b/contrib/bootstrap @@ -103,17 +103,11 @@ if test "$PREFIX" then # strip trailing slash PREFIX="${PREFIX%/}" -else - PREFIX="../hosts/$HOST" fi # # Prepare files # -echo "Creating prefix... $PREFIX" -mkdir -p -- "$PREFIX" || exit $? -mkdir -p -- "$PREFIX/share/aclocal" || exit $? - echo "Creating configuration file... config.mak" exec 3>config.mak cat >&3 << EOF @@ -121,7 +115,6 @@ cat >&3 << EOF # Any change will be overwritten if ../bootstrap is run again. BUILD := $BUILD HOST := $HOST -PREFIX := $PREFIX PKGS_DISABLE := $PKGS_DISABLE PKGS_ENABLE := $PKGS_ENABLE EOF @@ -144,6 +137,7 @@ add_make_enabled() done } +test -z "$PREFIX" || add_make "PREFIX := $PREFIX" test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS" test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
