Mercurial > hg > ucx / changeset

     1.1 --- a/configure	Fri Jan 26 19:17:46 2024 +0100
     1.2 +++ b/configure	Wed Feb 14 21:27:12 2024 +0100
     1.3 @@ -225,25 +225,25 @@
     1.4  
     1.5  # generate vars.mk
     1.6  cat > "$TEMP_DIR/vars.mk" << __EOF__
     1.7 -prefix="$prefix"
     1.8 -exec_prefix="$exec_prefix"
     1.9 -bindir="$bindir"
    1.10 -sbindir="$sbindir"
    1.11 -libdir="$libdir"
    1.12 -libexecdir="$libexecdir"
    1.13 -datarootdir="$datarootdir"
    1.14 -datadir="$datadir"
    1.15 -sysconfdir="$sysconfdir"
    1.16 -sharedstatedir="$sharedstatedir"
    1.17 -localstatedir="$localstatedir"
    1.18 -runstatedir="$runstatedir"
    1.19 -includedir="$includedir"
    1.20 -infodir="$infodir"
    1.21 -mandir="$mandir"
    1.22 -localedir="$localedir"
    1.23 -src_dir="$src_dir"
    1.24 -DOXYGEN="$DOXYGEN"
    1.25 -PANDOC="$PANDOC"
    1.26 +prefix=$prefix
    1.27 +exec_prefix=$exec_prefix
    1.28 +bindir=$bindir
    1.29 +sbindir=$sbindir
    1.30 +libdir=$libdir
    1.31 +libexecdir=$libexecdir
    1.32 +datarootdir=$datarootdir
    1.33 +datadir=$datadir
    1.34 +sysconfdir=$sysconfdir
    1.35 +sharedstatedir=$sharedstatedir
    1.36 +localstatedir=$localstatedir
    1.37 +runstatedir=$runstatedir
    1.38 +includedir=$includedir
    1.39 +infodir=$infodir
    1.40 +mandir=$mandir
    1.41 +localedir=$localedir
    1.42 +src_dir=$src_dir
    1.43 +DOXYGEN=$DOXYGEN
    1.44 +PANDOC=$PANDOC
    1.45  __EOF__
    1.46  
    1.47  # toolchain detection utilities
    1.48 @@ -342,7 +342,6 @@
    1.49  ARFLAGS=r
    1.50  STLIB_EXT=.lib
    1.51  SHLIB_EXT=.dll
    1.52 -
    1.53  __EOF__
    1.54          print_check_msg "$dep_checked_c" "yes\n"
    1.55          dep_checked_c=1
    1.56 @@ -364,7 +363,6 @@
    1.57  ARFLAGS=r
    1.58  STLIB_EXT=.a
    1.59  SHLIB_EXT=.dylib
    1.60 -
    1.61  __EOF__
    1.62          print_check_msg "$dep_checked_c" "yes\n"
    1.63          dep_checked_c=1
    1.64 @@ -386,7 +384,6 @@
    1.65  ARFLAGS=r
    1.66  STLIB_EXT=.a
    1.67  SHLIB_EXT=.so
    1.68 -
    1.69  __EOF__
    1.70          print_check_msg "$dep_checked_c" "yes\n"
    1.71          dep_checked_c=1
    1.72 @@ -399,19 +396,18 @@
    1.73  }
    1.74  dependency_error_file_tools()
    1.75  {
    1.76 -    print_check_msg "$dep_checked_file_tools" "checking for file-tools... "
    1.77 +    print_check_msg "$dep_checked_file_tools" "checking for file_tools... "
    1.78      # dependency file-tools
    1.79      while true
    1.80      do
    1.81          cat >> $TEMP_DIR/make.mk << __EOF__
    1.82 -# Dependency: file-tools
    1.83 +# Dependency: file_tools
    1.84  MKDIR=/bin/mkdir -p
    1.85  RMFILE=/bin/rm -f
    1.86  RMDIR=/bin/rm -f -R
    1.87  COPYFILE=/bin/cp -f
    1.88  COPYALL=/bin/cp -f -R
    1.89  SYMLINK=/bin/ln -s
    1.90 -
    1.91  __EOF__
    1.92          print_check_msg "$dep_checked_file_tools" "yes\n"
    1.93          dep_checked_file_tools=1
    1.94 @@ -467,7 +463,6 @@
    1.95  build_dir=${src_dir}/build
    1.96  docs_dir=${src_dir}/build/docs
    1.97  dist_dir=${src_dir}/dist
    1.98 -
    1.99  __EOF__
   1.100          break
   1.101      done
   1.102 @@ -505,7 +500,6 @@
   1.103  # Documentation
   1.104  WITH_DOCS_API=yes
   1.105  WITH_DOCS_HTML=yes
   1.106 -
   1.107  __EOF__
   1.108      return 0
   1.109  }
   1.110 @@ -521,7 +515,6 @@
   1.111      cat >> "$TEMP_DIR/make.mk" << __EOF__
   1.112  # Documentation
   1.113  WITH_DOCS_HTML=yes
   1.114 -
   1.115  __EOF__
   1.116      return 0
   1.117  }
   1.118 @@ -537,7 +530,6 @@
   1.119      cat >> "$TEMP_DIR/make.mk" << __EOF__
   1.120  # Documentation
   1.121  WITH_DOCS_API=yes
   1.122 -
   1.123  __EOF__
   1.124      return 0
   1.125  }

     2.1 --- a/make/configure.vm	Fri Jan 26 19:17:46 2024 +0100
     2.2 +++ b/make/configure.vm	Wed Feb 14 21:27:12 2024 +0100
     2.3 @@ -249,24 +249,24 @@
     2.4  
     2.5  # generate vars.mk
     2.6  cat > "$TEMP_DIR/vars.mk" << __EOF__
     2.7 -prefix="$prefix"
     2.8 -exec_prefix="$exec_prefix"
     2.9 -bindir="$bindir"
    2.10 -sbindir="$sbindir"
    2.11 -libdir="$libdir"
    2.12 -libexecdir="$libexecdir"
    2.13 -datarootdir="$datarootdir"
    2.14 -datadir="$datadir"
    2.15 -sysconfdir="$sysconfdir"
    2.16 -sharedstatedir="$sharedstatedir"
    2.17 -localstatedir="$localstatedir"
    2.18 -runstatedir="$runstatedir"
    2.19 -includedir="$includedir"
    2.20 -infodir="$infodir"
    2.21 -mandir="$mandir"
    2.22 -localedir="$localedir"
    2.23 +prefix=$prefix
    2.24 +exec_prefix=$exec_prefix
    2.25 +bindir=$bindir
    2.26 +sbindir=$sbindir
    2.27 +libdir=$libdir
    2.28 +libexecdir=$libexecdir
    2.29 +datarootdir=$datarootdir
    2.30 +datadir=$datadir
    2.31 +sysconfdir=$sysconfdir
    2.32 +sharedstatedir=$sharedstatedir
    2.33 +localstatedir=$localstatedir
    2.34 +runstatedir=$runstatedir
    2.35 +includedir=$includedir
    2.36 +infodir=$infodir
    2.37 +mandir=$mandir
    2.38 +localedir=$localedir
    2.39  #foreach( $var in $vars )
    2.40 -${var.varName}="${D}${var.varName}"
    2.41 +${var.varName}=${D}${var.varName}
    2.42  #end
    2.43  __EOF__
    2.44