diff --git a/configure b/configure index 764203d368eac15f4e39cf70173c32c38c0618f0..919d7faa8c39f7b3f02d898af75e18fc166f0d74 100755 --- a/configure +++ b/configure @@ -2815,6 +2815,10 @@ fi +# Get the architecture, in some cases `arch` is not present on the system +LKT_ARCH=`arch` +if test $? -ne 0 ; then LKT_ARCH=`uname -m` ; fi + LKT_PATH_SOURCE="$(dirname $(readlink -f "$0"))" LKT_PATH_BUILD="$(pwd)" @@ -18499,9 +18503,9 @@ fi as_fn_error $? "chmod is required for AppImage" "$LINENO" 5 fi - LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool-`arch`.AppImage" - LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage" - LKT_LINUXDEPLOYQT="$LKT_PATH_SOURCE/utils/linuxdeploy-qt-`arch`.AppImage" + LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool-$LKT_ARCH.AppImage" + LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy-$LKT_ARCH.AppImage" + LKT_LINUXDEPLOYQT="$LKT_PATH_SOURCE/utils/linuxdeploy-qt-$LKT_ARCH.AppImage" @@ -18523,7 +18527,7 @@ as_fn_error $? "failed from path See \`config.log' for more details" "$LINENO" 5; } fi else - $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage \ + $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-$LKT_ARCH.AppImage \ -O "$LKT_APPIMAGETOOL" -a config.wget.log $CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage if test $? -eq 0 ; then : @@ -18663,7 +18667,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define LKT_ARCH "$(arch)" +#define LKT_ARCH "$LKT_ARCH" _ACEOF diff --git a/configure.ac b/configure.ac index 27d05f29050054391910ac60aa7fa7dd40926748..d116756a95c100caf1cd786a73c7110b1f3dfafa 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,10 @@ AC_PATH_PROG([MKVPROPEDIT], [mkvpropedit], [:]) AC_PATH_PROG([TEST_MAKE], [make], [:]) AC_PATH_PROG([TEST_SQLITE], [sqlite3], [:]) +# Get the architecture, in some cases `arch` is not present on the system +LKT_ARCH=`arch` +if test $? -ne 0 ; then LKT_ARCH=`uname -m` ; fi + LKT_PATH_SOURCE="$(dirname $(readlink -f "$0"))" LKT_PATH_BUILD="$(pwd)" AC_SUBST([LKT_PATH_SOURCE]) @@ -173,9 +177,9 @@ AS_IF([test "x${LKT_APPIMAGE}" = "xyes"], [ AS_IF([test "$WGET" = ":"], [AC_MSG_ERROR([wget is required for AppImage]) ]) AS_IF([test "$CHMOD" = ":"], [AC_MSG_ERROR([chmod is required for AppImage]) ]) - LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool-`arch`.AppImage" - LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy-`arch`.AppImage" - LKT_LINUXDEPLOYQT="$LKT_PATH_SOURCE/utils/linuxdeploy-qt-`arch`.AppImage" + LKT_APPIMAGETOOL="$LKT_PATH_SOURCE/utils/appimagetool-$LKT_ARCH.AppImage" + LKT_LINUXDEPLOY="$LKT_PATH_SOURCE/utils/linuxdeploy-$LKT_ARCH.AppImage" + LKT_LINUXDEPLOYQT="$LKT_PATH_SOURCE/utils/linuxdeploy-qt-$LKT_ARCH.AppImage" AC_SUBST([LKT_APPIMAGETOOL]) AC_SUBST([LKT_LINUXDEPLOY]) AC_SUBST([LKT_LINUXDEPLOYQT]) @@ -188,7 +192,7 @@ AS_IF([test "x${LKT_APPIMAGE}" = "xyes"], [ cp $PRESENT_IN_PATH $LKT_APPIMAGETOOL AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([from path])], [AC_MSG_FAILURE([failed from path])]) else - $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage \ + $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-$LKT_ARCH.AppImage \ -O "$LKT_APPIMAGETOOL" -a config.wget.log $CHMOD 00700 $LKT_PATH_SOURCE/utils/appimagetool.AppImage AS_IF([test $? -eq 0 ], [AC_MSG_RESULT([done])], [AC_MSG_FAILURE([failed])]) @@ -254,7 +258,7 @@ AC_SUBST([LKT_MAN_BINARY]) AC_DEFINE_UNQUOTED([LKT_COMPILER], ["$CC"], [Lektor compiled with]) AC_SUBST([LKT_COMPILER]) -AC_DEFINE_UNQUOTED([LKT_ARCH], ["$(arch)"], [Host architecture]) +AC_DEFINE_UNQUOTED([LKT_ARCH], ["$LKT_ARCH"], [Host architecture]) AC_SUBST([LKT_ARCH]) LKT_BUILD_STRING="$(basename $CC)/$(basename $CXX) $(uname -s) $(uname -p) $(uname -r) $(uname -m)"