Mercurial > hg > ucx / changeset

--- a/configure	Sun Nov 30 13:55:12 2025 +0100
+++ b/configure	Sun Nov 30 14:08:52 2025 +0100
@@ -113,6 +113,32 @@
   --includedir            C header files [PREFIX/include]
 __EOF__
     fi
+fi
+if true \
+    && isplatform "bsd" \
+      ; then
+    :
+    if test -z "$pkgconfigdir__described__"; then
+        pkgconfigdir__described__=1
+        cat << '__EOF__'
+  --pkgconfigdir          location of the *.pc files
+__EOF__
+    fi
+fi
+if true \
+      && notisplatform "bsd" \
+      ; then
+    :
+    if test -z "$pkgconfigdir__described__"; then
+        pkgconfigdir__described__=1
+        cat << '__EOF__'
+  --pkgconfigdir          location of the *.pc files
+__EOF__
+    fi
+fi
+if true \
+      ; then
+    :
     if test -z "$DOXYGEN__described__"; then
         DOXYGEN__described__=1
         cat << '__EOF__'
@@ -120,16 +146,6 @@
 __EOF__
     fi
 fi
-if true \
-    && isplatform "bsd" \
-      ; then
-    :
-fi
-if true \
-      && notisplatform "bsd" \
-      ; then
-    :
-fi
     cat << '__EOF__'
 
 Build Types:
@@ -167,31 +183,31 @@
     :
     if test -z "$prefix__initialized__"; then
         prefix__initialized__=1
-        prefix="/usr"
+        prefix='/usr'
     fi
     if test -z "$exec_prefix__initialized__"; then
         exec_prefix__initialized__=1
-        exec_prefix=""
+        exec_prefix=''
     fi
     if test -z "$libdir__initialized__"; then
         libdir__initialized__=1
-        libdir=""
+        libdir=''
     fi
     if test -z "$includedir__initialized__"; then
         includedir__initialized__=1
-        includedir=""
+        includedir=''
     fi
     if test -z "$VERSION__initialized__"; then
         VERSION__initialized__=1
-        VERSION="3.2.0"
+        VERSION='3.2.0'
     fi
     if test -z "$LIBVERSION__initialized__"; then
         LIBVERSION__initialized__=1
-        LIBVERSION="6.0.0"
+        LIBVERSION='6.0.0'
     fi
     if test -z "$LIBVERSION_MAJOR__initialized__"; then
         LIBVERSION_MAJOR__initialized__=1
-        LIBVERSION_MAJOR="6"
+        LIBVERSION_MAJOR='6'
     fi
     if test -z "$root_dir__initialized__"; then
         root_dir__initialized__=1
@@ -199,43 +215,39 @@
     fi
     if test -z "$build_dir__initialized__"; then
         build_dir__initialized__=1
-        build_dir="\${root_dir}/build"
+        build_dir='${root_dir}/build'
     fi
     if test -z "$docs_dir__initialized__"; then
         docs_dir__initialized__=1
-        docs_dir="\${root_dir}/build/docs"
+        docs_dir='${root_dir}/build/docs'
     fi
     if test -z "$dist_dir__initialized__"; then
         dist_dir__initialized__=1
-        dist_dir="\${root_dir}/dist"
-    fi
-    if test -z "$DOXYGEN__initialized__"; then
-        DOXYGEN__initialized__=1
-        DOXYGEN=`command -v doxygen || echo '/bin/false'`
+        dist_dir='${root_dir}/dist'
     fi
     if test -z "$MKDIR__initialized__"; then
         MKDIR__initialized__=1
-        MKDIR="/bin/mkdir -p"
+        MKDIR='/bin/mkdir -p'
     fi
     if test -z "$RMFILE__initialized__"; then
         RMFILE__initialized__=1
-        RMFILE="/bin/rm -f"
+        RMFILE='/bin/rm -f'
     fi
     if test -z "$RMDIR__initialized__"; then
         RMDIR__initialized__=1
-        RMDIR="/bin/rm -f -R"
+        RMDIR='/bin/rm -f -R'
     fi
     if test -z "$COPYFILE__initialized__"; then
         COPYFILE__initialized__=1
-        COPYFILE="/bin/cp -f"
+        COPYFILE='/bin/cp -f'
     fi
     if test -z "$COPYALL__initialized__"; then
         COPYALL__initialized__=1
-        COPYALL="/bin/cp -f -R"
+        COPYALL='/bin/cp -f -R'
     fi
     if test -z "$SYMLINK__initialized__"; then
         SYMLINK__initialized__=1
-        SYMLINK="/bin/ln -s"
+        SYMLINK='/bin/ln -s'
     fi
 fi
 if true \
@@ -244,7 +256,7 @@
     :
     if test -z "$pkgconfigdir__initialized__"; then
         pkgconfigdir__initialized__=1
-        pkgconfigdir="\${exec_prefix}/libdata/pkgconfig"
+        pkgconfigdir='${exec_prefix}/libdata/pkgconfig'
     fi
 fi
 if true \
@@ -253,7 +265,15 @@
     :
     if test -z "$pkgconfigdir__initialized__"; then
         pkgconfigdir__initialized__=1
-        pkgconfigdir="\${libdir}/pkgconfig"
+        pkgconfigdir='${libdir}/pkgconfig'
+    fi
+fi
+if true \
+      ; then
+    :
+    if test -z "$DOXYGEN__initialized__"; then
+        DOXYGEN__initialized__=1
+        DOXYGEN=`command -v doxygen || echo '/bin/false'`
     fi
 fi
 
@@ -273,6 +293,7 @@
         "--exec-prefix="*) exec_prefix=${ARG#--exec-prefix=} ;;
         "--libdir="*) libdir=${ARG#--libdir=} ;;
         "--includedir="*) includedir=${ARG#--includedir=} ;;
+        "--pkgconfigdir="*) pkgconfigdir=${ARG#--pkgconfigdir=} ;;
         "--doxygen="*) DOXYGEN=${ARG#--doxygen=} ;;
         "--help"*) printhelp ;;
         "--debug") BUILD_TYPE="debug" ;;
@@ -404,7 +425,6 @@
 build_dir=$build_dir
 docs_dir=$docs_dir
 dist_dir=$dist_dir
-DOXYGEN=$DOXYGEN
 MKDIR=$MKDIR
 RMFILE=$RMFILE
 RMDIR=$RMDIR
@@ -412,6 +432,7 @@
 COPYALL=$COPYALL
 SYMLINK=$SYMLINK
 pkgconfigdir=$pkgconfigdir
+DOXYGEN=$DOXYGEN
 __EOF__
 
 
@@ -907,6 +928,8 @@
     echo "$libdir"
     printf '  %-16s' 'includedir:'
     echo "$includedir"
+    printf '  %-16s' 'pkgconfigdir:'
+    echo "$pkgconfigdir"
     printf '  %-16s' 'doxygen:'
     echo "$DOXYGEN"
 echo

--- a/make/configure.vm	Sun Nov 30 13:55:12 2025 +0100
+++ b/make/configure.vm	Sun Nov 30 14:08:52 2025 +0100
@@ -163,7 +163,7 @@
         #if( $var.exec )
         ${var.varName}=`${var.value}`
         #else
-        ${var.varName}="${var.value}"
+        ${var.varName}='${var.value}'
         #end
     fi
     #end

--- a/make/project.xml	Sun Nov 30 13:55:12 2025 +0100
+++ b/make/project.xml	Sun Nov 30 14:08:52 2025 +0100
@@ -9,12 +9,9 @@
         <var name="LIBVERSION">6.0.0</var>
         <var name="LIBVERSION_MAJOR">6</var>
         <var name="root_dir" exec="true">pwd</var>
-        <var name="build_dir">\${root_dir}/build</var>
-        <var name="docs_dir">\${root_dir}/build/docs</var>
-        <var name="dist_dir">\${root_dir}/dist</var>
-        <var name="DOXYGEN" exec="true" option-help="path of the Doxygen executable">
-            command -v doxygen || echo '/bin/false'
-        </var>
+        <var name="build_dir">${root_dir}/build</var>
+        <var name="docs_dir">${root_dir}/build/docs</var>
+        <var name="dist_dir">${root_dir}/dist</var>
         <var name="MKDIR">/bin/mkdir -p</var>
         <var name="RMFILE">/bin/rm -f</var>
         <var name="RMDIR">/bin/rm -f -R</var>
@@ -23,10 +20,19 @@
         <var name="SYMLINK">/bin/ln -s</var>
     </config>
     <config platform="bsd">
-        <var name="pkgconfigdir">\${exec_prefix}/libdata/pkgconfig</var>
+        <var name="pkgconfigdir" option-help="location of the *.pc files">
+            ${exec_prefix}/libdata/pkgconfig
+        </var>
     </config>
     <config not="bsd">
-        <var name="pkgconfigdir">\${libdir}/pkgconfig</var>
+        <var name="pkgconfigdir" option-help="location of the *.pc files">
+            ${libdir}/pkgconfig
+        </var>
+    </config>
+    <config>
+        <var name="DOXYGEN" exec="true" option-help="path of the Doxygen executable">
+            command -v doxygen || echo '/bin/false'
+        </var>
     </config>
 
     <dependency platform="macos">