Commit 03bbc76f authored by Rémi Denis-Courmont's avatar 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.
parent d0746cf8
...@@ -103,17 +103,11 @@ if test "$PREFIX" ...@@ -103,17 +103,11 @@ if test "$PREFIX"
then then
# strip trailing slash # strip trailing slash
PREFIX="${PREFIX%/}" PREFIX="${PREFIX%/}"
else
PREFIX="../hosts/$HOST"
fi fi
# #
# Prepare files # Prepare files
# #
echo "Creating prefix... $PREFIX"
mkdir -p -- "$PREFIX" || exit $?
mkdir -p -- "$PREFIX/share/aclocal" || exit $?
echo "Creating configuration file... config.mak" echo "Creating configuration file... config.mak"
exec 3>config.mak exec 3>config.mak
cat >&3 << EOF cat >&3 << EOF
...@@ -121,7 +115,6 @@ cat >&3 << EOF ...@@ -121,7 +115,6 @@ cat >&3 << EOF
# Any change will be overwritten if ../bootstrap is run again. # Any change will be overwritten if ../bootstrap is run again.
BUILD := $BUILD BUILD := $BUILD
HOST := $HOST HOST := $HOST
PREFIX := $PREFIX
PKGS_DISABLE := $PKGS_DISABLE PKGS_DISABLE := $PKGS_DISABLE
PKGS_ENABLE := $PKGS_ENABLE PKGS_ENABLE := $PKGS_ENABLE
EOF EOF
...@@ -144,6 +137,7 @@ add_make_enabled() ...@@ -144,6 +137,7 @@ add_make_enabled()
done done
} }
test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS" test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS" test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment