From c04144a5cf8d89c39ec9084105b019e696299b75 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Wed, 17 Jan 2024 18:49:53 +0000 Subject: [PATCH] install to fixed prefix --- build-devkit.sh | 24 +++++++++++------------- config.sh.sample | 6 ------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/build-devkit.sh b/build-devkit.sh index 0309797..bd099ee 100755 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -72,20 +72,18 @@ fi . ./select_toolchain.sh #--------------------------------------------------------------------------------- -# Get preferred installation directory and set paths to the sources +# Legacy versions of these scripts allowed the selection of a prefix which is +# no longer supported. Since adopting pacman and providing precompiled binaries +# of "portlibs" everything we distribute is intended to work within opt/devkitpro +# +# Rather than attempting to repackage our work for exotic linux distributions it +# would be much better for everyone concerned if efforts were made to provide +# pacman and whatever support is necessary to allow the binaries we distribute to +# work as expected. +# +# See https://github.com/devkitPro/pacman and https://devkitpro.org/wiki/devkitPro_pacman #--------------------------------------------------------------------------------- - -if [ ! -z "$BUILD_DKPRO_INSTALLDIR" ] ; then - INSTALLDIR="$BUILD_DKPRO_INSTALLDIR" -else - echo - echo "Please enter the directory where you would like '$package' to be installed:" - echo "for mingw/msys you must use :/ or you will have include path problems" - echo "this is the top level directory for devkitpro, i.e. e:/devkitPro" - - read -e INSTALLDIR - echo -fi +INSTALLDIR=/opt/devkitpro [ ! -z "$INSTALLDIR" ] && mkdir -p $INSTALLDIR && touch $INSTALLDIR/nonexistantfile && rm $INSTALLDIR/nonexistantfile || exit 1; diff --git a/config.sh.sample b/config.sh.sample index 94a12c4..671f8e6 100755 --- a/config.sh.sample +++ b/config.sh.sample @@ -13,12 +13,6 @@ #--------------------------------------------------------------------------------- BUILD_DKPRO_PACKAGE=0 -#--------------------------------------------------------------------------------- -# Toolchain installation directory, comment if not specified -#--------------------------------------------------------------------------------- -#BUILD_DKPRO_INSTALLDIR=/opt/devkitpro -#BUILD_DKPRO_INSTALLDIR=c:/devkitPro - #--------------------------------------------------------------------------------- # Path to previously downloaded source packages, comment if not specified #---------------------------------------------------------------------------------