# HG changeset patch # User Olaf Wintermann # Date 1764436278 -3600 # Node ID fa31a6d0ec56a994eac44574c9e3eef5c7705c50 # Parent 9bb4b40d61b75ed19097445577f832ba8e36277a improve 64 libdir detection on solaris diff -r 9bb4b40d61b7 -r fa31a6d0ec56 src/main/resources/make/configure.vm --- a/src/main/resources/make/configure.vm Sat Nov 29 17:36:36 2025 +0100 +++ b/src/main/resources/make/configure.vm Sat Nov 29 18:11:18 2025 +0100 @@ -264,7 +264,7 @@ # try to detect the correct libdir on our own, except it was changed by the user if test "$libdir" = '${exec_prefix}/lib'; then if [ "$OS" = "SunOS" ]; then - test -d "${exec_prefix}/lib/amd64" && libdir='${exec_prefix}/lib/amd64' + test -d "${exec_prefix}/lib/64" && libdir='${exec_prefix}/lib/64' else # check if the standard libdir even exists if test -d "${exec_prefix}/lib" ; then diff -r 9bb4b40d61b7 -r fa31a6d0ec56 test/configure --- a/test/configure Sat Nov 29 17:36:36 2025 +0100 +++ b/test/configure Sat Nov 29 18:11:18 2025 +0100 @@ -251,7 +251,7 @@ # try to detect the correct libdir on our own, except it was changed by the user if test "$libdir" = '${exec_prefix}/lib'; then if [ "$OS" = "SunOS" ]; then - test -d "${exec_prefix}/lib/amd64" && libdir='${exec_prefix}/lib/amd64' + test -d "${exec_prefix}/lib/64" && libdir='${exec_prefix}/lib/64' else # check if the standard libdir even exists if test -d "${exec_prefix}/lib" ; then diff -r 9bb4b40d61b7 -r fa31a6d0ec56 test/configure2 --- a/test/configure2 Sat Nov 29 17:36:36 2025 +0100 +++ b/test/configure2 Sat Nov 29 18:11:18 2025 +0100 @@ -290,7 +290,7 @@ # try to detect the correct libdir on our own, except it was changed by the user if test "$libdir" = '${exec_prefix}/lib'; then if [ "$OS" = "SunOS" ]; then - test -d "${exec_prefix}/lib/amd64" && libdir='${exec_prefix}/lib/amd64' + test -d "${exec_prefix}/lib/64" && libdir='${exec_prefix}/lib/64' else # check if the standard libdir even exists if test -d "${exec_prefix}/lib" ; then diff -r 9bb4b40d61b7 -r fa31a6d0ec56 test/make/configure.vm --- a/test/make/configure.vm Sat Nov 29 17:36:36 2025 +0100 +++ b/test/make/configure.vm Sat Nov 29 18:11:18 2025 +0100 @@ -264,7 +264,7 @@ # try to detect the correct libdir on our own, except it was changed by the user if test "$libdir" = '${exec_prefix}/lib'; then if [ "$OS" = "SunOS" ]; then - test -d "${exec_prefix}/lib/amd64" && libdir='${exec_prefix}/lib/amd64' + test -d "${exec_prefix}/lib/64" && libdir='${exec_prefix}/lib/64' else # check if the standard libdir even exists if test -d "${exec_prefix}/lib" ; then