# HG changeset patch # User Mike Becker # Date 1707942432 -3600 # Node ID 5e6f15005efd5238720274af41236ea78b898795 # Parent 8b86ee2e09bbf23728e8ceea54cea4e581db1c95 update uwproj configure template diff -r 8b86ee2e09bb -r 5e6f15005efd configure --- a/configure Fri Jan 26 19:17:46 2024 +0100 +++ b/configure Wed Feb 14 21:27:12 2024 +0100 @@ -225,25 +225,25 @@ # generate vars.mk cat > "$TEMP_DIR/vars.mk" << __EOF__ -prefix="$prefix" -exec_prefix="$exec_prefix" -bindir="$bindir" -sbindir="$sbindir" -libdir="$libdir" -libexecdir="$libexecdir" -datarootdir="$datarootdir" -datadir="$datadir" -sysconfdir="$sysconfdir" -sharedstatedir="$sharedstatedir" -localstatedir="$localstatedir" -runstatedir="$runstatedir" -includedir="$includedir" -infodir="$infodir" -mandir="$mandir" -localedir="$localedir" -src_dir="$src_dir" -DOXYGEN="$DOXYGEN" -PANDOC="$PANDOC" +prefix=$prefix +exec_prefix=$exec_prefix +bindir=$bindir +sbindir=$sbindir +libdir=$libdir +libexecdir=$libexecdir +datarootdir=$datarootdir +datadir=$datadir +sysconfdir=$sysconfdir +sharedstatedir=$sharedstatedir +localstatedir=$localstatedir +runstatedir=$runstatedir +includedir=$includedir +infodir=$infodir +mandir=$mandir +localedir=$localedir +src_dir=$src_dir +DOXYGEN=$DOXYGEN +PANDOC=$PANDOC __EOF__ # toolchain detection utilities @@ -342,7 +342,6 @@ ARFLAGS=r STLIB_EXT=.lib SHLIB_EXT=.dll - __EOF__ print_check_msg "$dep_checked_c" "yes\n" dep_checked_c=1 @@ -364,7 +363,6 @@ ARFLAGS=r STLIB_EXT=.a SHLIB_EXT=.dylib - __EOF__ print_check_msg "$dep_checked_c" "yes\n" dep_checked_c=1 @@ -386,7 +384,6 @@ ARFLAGS=r STLIB_EXT=.a SHLIB_EXT=.so - __EOF__ print_check_msg "$dep_checked_c" "yes\n" dep_checked_c=1 @@ -399,19 +396,18 @@ } dependency_error_file_tools() { - print_check_msg "$dep_checked_file_tools" "checking for file-tools... " + print_check_msg "$dep_checked_file_tools" "checking for file_tools... " # dependency file-tools while true do cat >> $TEMP_DIR/make.mk << __EOF__ -# Dependency: file-tools +# Dependency: file_tools MKDIR=/bin/mkdir -p RMFILE=/bin/rm -f RMDIR=/bin/rm -f -R COPYFILE=/bin/cp -f COPYALL=/bin/cp -f -R SYMLINK=/bin/ln -s - __EOF__ print_check_msg "$dep_checked_file_tools" "yes\n" dep_checked_file_tools=1 @@ -467,7 +463,6 @@ build_dir=${src_dir}/build docs_dir=${src_dir}/build/docs dist_dir=${src_dir}/dist - __EOF__ break done @@ -505,7 +500,6 @@ # Documentation WITH_DOCS_API=yes WITH_DOCS_HTML=yes - __EOF__ return 0 } @@ -521,7 +515,6 @@ cat >> "$TEMP_DIR/make.mk" << __EOF__ # Documentation WITH_DOCS_HTML=yes - __EOF__ return 0 } @@ -537,7 +530,6 @@ cat >> "$TEMP_DIR/make.mk" << __EOF__ # Documentation WITH_DOCS_API=yes - __EOF__ return 0 } diff -r 8b86ee2e09bb -r 5e6f15005efd make/configure.vm --- a/make/configure.vm Fri Jan 26 19:17:46 2024 +0100 +++ b/make/configure.vm Wed Feb 14 21:27:12 2024 +0100 @@ -249,24 +249,24 @@ # generate vars.mk cat > "$TEMP_DIR/vars.mk" << __EOF__ -prefix="$prefix" -exec_prefix="$exec_prefix" -bindir="$bindir" -sbindir="$sbindir" -libdir="$libdir" -libexecdir="$libexecdir" -datarootdir="$datarootdir" -datadir="$datadir" -sysconfdir="$sysconfdir" -sharedstatedir="$sharedstatedir" -localstatedir="$localstatedir" -runstatedir="$runstatedir" -includedir="$includedir" -infodir="$infodir" -mandir="$mandir" -localedir="$localedir" +prefix=$prefix +exec_prefix=$exec_prefix +bindir=$bindir +sbindir=$sbindir +libdir=$libdir +libexecdir=$libexecdir +datarootdir=$datarootdir +datadir=$datadir +sysconfdir=$sysconfdir +sharedstatedir=$sharedstatedir +localstatedir=$localstatedir +runstatedir=$runstatedir +includedir=$includedir +infodir=$infodir +mandir=$mandir +localedir=$localedir #foreach( $var in $vars ) -${var.varName}="${D}${var.varName}" +${var.varName}=${D}${var.varName} #end __EOF__