--- a/test/configure2 Mon Dec 01 20:38:17 2025 +0100 +++ b/test/configure2 Mon Dec 01 21:27:09 2025 +0100 @@ -118,6 +118,12 @@ [PREFIX/share] __EOF__ fi + if [ -z "$datadir__described__" ] ; then + datadir__described__=1 + cat << '__EOF__' + --datadir read-only architecture-independent data [DATAROOTDIR] +__EOF__ + fi if [ -z "$localstatedir__described__" ] ; then localstatedir__described__=1 cat << '__EOF__' @@ -197,6 +203,11 @@ datarootdir__initialized__=1 datarootdir='' fi + if [ -z "$datadir__initialized__" ] ; then + has_config_vars__=1 + datadir__initialized__=1 + datadir='' + fi if [ -z "$localstatedir__initialized__" ] ; then has_config_vars__=1 localstatedir__initialized__=1 @@ -233,6 +244,7 @@ "--exec-prefix="*) exec_prefix=${ARG#--exec-prefix=} ;; "--libdir="*) libdir=${ARG#--libdir=} ;; "--datarootdir="*) datarootdir=${ARG#--datarootdir=} ;; + "--datadir="*) datadir=${ARG#--datadir=} ;; "--localstatedir="*) localstatedir=${ARG#--localstatedir=} ;; "--libdatadir="*) libdatadir=${ARG#--libdatadir=} ;; "--toolkit-home="*) TOOLKIT_HOME=${ARG#--toolkit-home=} ;; @@ -351,6 +363,7 @@ echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk" echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk" echo "datarootdir=$datarootdir" >> "$TEMP_DIR/vars.mk" + echo "datadir=$datadir" >> "$TEMP_DIR/vars.mk" echo "localstatedir=$localstatedir" >> "$TEMP_DIR/vars.mk" echo "libdatadir=$libdatadir" >> "$TEMP_DIR/vars.mk" echo "SRCDIR=$SRCDIR" >> "$TEMP_DIR/vars.mk" @@ -945,6 +958,10 @@ printf ' %-16s' 'datarootdir:' echo "$datarootdir" fi + if [ -n "$datadir__initialized__" ]; then + printf ' %-16s' 'datadir:' + echo "$datadir" + fi if [ -n "$localstatedir__initialized__" ]; then printf ' %-16s' 'localstatedir:' echo "$localstatedir"