diff bmake-beta/boot-strap bmake/boot-strap 122c122 < # $Id: boot-strap,v 1.58 2023/06/27 21:02:19 sjg Exp $ --- > # $Id: boot-strap,v 1.57 2021/10/22 20:32:21 sjg Exp $ 423c423 < Bmake test TEST_MAKE=$objdir/bmake "$@" || exit 1 --- > Bmake test "$@" || exit 1 diff bmake-beta/ChangeLog bmake/ChangeLog 1,22d0 < 2023-07-15 Simon J Gerraty < < * make-bootstrap.sh.in: set prefix < If configure is run using ksh we get unexpanded ${prefix} in < DEFAULT_SYS_PATH, by ensuring prefix is set we should still get < correct result. < < 2023-07-13 Simon J Gerraty < < * VERSION (_MAKE_VERSION): 20230711 < bump version for IRIX tweaks < < * make.h: undef OP_NONE if defined < < * unit-tests/Makefile: set BROKEN_TESTS for IRIX < < * configure.in: override INSTALL on IRIX < < 2023-06-27 Simon J Gerraty < < * boot-strap op_test: ensure we set TEST_MAKE as we want it. < Only in bmake-beta/: config.h Only in bmake-beta/: config.log diff bmake-beta/configure bmake/configure 3c3 < # Generated by GNU Autoconf 2.71 for bmake 20230711. --- > # Generated by GNU Autoconf 2.71 for bmake 20220909. 613,614c613,614 < PACKAGE_VERSION='20230711' < PACKAGE_STRING='bmake 20230711' --- > PACKAGE_VERSION='20220909' > PACKAGE_STRING='bmake 20220909' 1293c1293 < \`configure' configures bmake 20230711 to adapt to many kinds of systems. --- > \`configure' configures bmake 20220909 to adapt to many kinds of systems. 1355c1355 < short | recursive ) echo "Configuration of bmake 20230711:";; --- > short | recursive ) echo "Configuration of bmake 20220909:";; 1370,1373c1370 < --with-defshell=[name=]SHELL use SHELL by default < optional 'name' can be 'sh' to indicate SHELL is sh compatible < eg. --with-defshell=sh=/bin/bsh < use just 'sh' or 'ksh' to pick the internal definitions --- > --with-defshell=SHELL use SHELL by default - must be sh compatible, use sh or ksh to pick the internal definitions 1464c1461 < bmake configure 20230711 --- > bmake configure 20220909 1971c1968 < It was created by bmake $as_me 20230711, which was --- > It was created by bmake $as_me 20220909, which was 2754c2751 < sh|/bin/sh|*/bsh) --- > sh|/bin/sh) 2756,2764d2752 < *=*) # eg. sh=/bin/bsh < eval `IFS="="; set -- $1; echo name=$1 defshell_path=$2` < case "$name" in < csh) DEFSHELL_INDEX=DEFSHELL_INDEX_CSH;; < ksh) DEFSHELL_INDEX=DEFSHELL_INDEX_KSH;; < sh) DEFSHELL_INDEX=DEFSHELL_INDEX_SH;; < *) DEFSHELL_INDEX=DEFSHELL_INDEX_CUSTOM;; < esac < ;; 2769,2771c2757,2759 < case "$defshell_path,$1" in < ,/bin/*) ;; < ,*/*) defshell_path=$1;; --- > case "$1" in > /bin/*) ;; > */*) defshell_path=$1;; 2866,2867d2853 < # Not everyone groks TZ=Europe/Berlin < # which is used by the localtime tests 2869,2871c2855 < utcH=`TZ=UTC date +%H 2> /dev/null` < utc_1H=`TZ=Europe/Berlin date +%H 2> /dev/null` < if test ${utcH-0} -lt ${utc_1H-0}; then --- > if test -f /usr/share/zoneinfo/Europe/Berlin; then 2872a2857 > # seems a safe bet 2874a2860 > utcH=`TZ=UTC date +%H 2> /dev/null` 2878a2865,2866 > else > echo no >&6 2881d2868 < test "x$UTC_1" = x && echo no >&6 4886,4889d4872 < # We have to override that on some systems < case "$OS" in < IRIX*) ac_INSTALL=$srcdir/install-sh;; < esac 4901,4902d4883 < # if type does not work which(1) had better! < # note we cannot rely on type returning non-zero on failure 7577c7558 < This file was extended by bmake $as_me 20230711, which was --- > This file was extended by bmake $as_me 20220909, which was 7641c7622 < bmake config.status 20230711 --- > bmake config.status 20220909 diff bmake-beta/configure.in bmake/configure.in 3c3 < dnl $Id: configure.in,v 1.94 2023/07/16 16:13:37 sjg Exp $ --- > dnl $Id: configure.in,v 1.87 2022/09/09 20:00:53 sjg Exp $ 8c8 < AC_INIT([bmake],[20230711],[sjg@NetBSD.org]) --- > AC_INIT([bmake],[20220909],[sjg@NetBSD.org]) 32c32 < sh|/bin/sh|*/bsh) --- > sh|/bin/sh) 34,42d33 < *=*) # eg. sh=/bin/bsh < eval `IFS="="; set -- $1; echo name=$1 defshell_path=$2` < case "$name" in < csh) DEFSHELL_INDEX=DEFSHELL_INDEX_CSH;; < ksh) DEFSHELL_INDEX=DEFSHELL_INDEX_KSH;; < sh) DEFSHELL_INDEX=DEFSHELL_INDEX_SH;; < *) DEFSHELL_INDEX=DEFSHELL_INDEX_CUSTOM;; < esac < ;; 47,49c38,40 < case "$defshell_path,$1" in < ,/bin/*) ;; < ,*/*) defshell_path=$1;; --- > case "$1" in > /bin/*) ;; > */*) defshell_path=$1;; 54,57c45 < [ --with-defshell=[[name=]]SHELL use SHELL by default < optional 'name' can be 'sh' to indicate SHELL is sh compatible < eg. --with-defshell=sh=/bin/bsh < use just 'sh' or 'ksh' to pick the internal definitions], --- > [ --with-defshell=SHELL use SHELL by default - must be sh compatible, use sh or ksh to pick the internal definitions], 141,142c129,130 < # Not everyone groks TZ=Europe/Berlin < # which is used by the localtime tests --- > dnl Not everyone groks TZ=Europe/Berlin > dnl which is used by the localtime tests 144,146c132 < utcH=`TZ=UTC date +%H 2> /dev/null` < utc_1H=`TZ=Europe/Berlin date +%H 2> /dev/null` < if test ${utcH-0} -lt ${utc_1H-0}; then --- > if test -f /usr/share/zoneinfo/Europe/Berlin; then 147a134 > # seems a safe bet 149a137 > utcH=`TZ=UTC date +%H 2> /dev/null` 153a142,143 > else > echo no >&6 156d145 < test "x$UTC_1" = x && echo no >&6 174,177d162 < # We have to override that on some systems < case "$OS" in < IRIX*) ac_INSTALL=$srcdir/install-sh;; < esac 195,196c180,181 < # if type does not work which(1) had better! < # note we cannot rely on type returning non-zero on failure --- > dnl if type does not work which(1) had better! > dnl note we cannot rely on type returning non-zero on failure Common subdirectories: bmake-beta/filemon and bmake/filemon diff bmake-beta/install-sh bmake/install-sh 1,2c1 < #!/bin/sh < --- > : 50c49 < # fail on many systems. We ignore '-b' and '-c' options. --- > # fail on many systems. We ignore '-b', '-B' and '-c' options. 57c56 < # $Id: install-sh,v 1.25 2023/07/15 05:33:38 sjg Exp $ --- > # $Id: install-sh,v 1.22 2023/01/28 16:21:19 sjg Exp $ 77d75 < OLD_EXT=.old 94d91 < -[bc]) ;; # ignore 161c158 < *) # some systems put chown in odd places --- > *) 191c188,190 < if [ $# -eq 1 ]; then --- > if [ $# -gt 2 ]; then > dest_dir=yes > elif [ $# -eq 1 ]; then 197d195 < files= 200d197 < test "x$files" = x || dest_dir=yes 207a205 > 223c221 < [ -f $t ] && { mv -f $t $t$OLD_EXT || exit 1; } --- > [ -f $t ] && { mv -f $t $t.old || exit 1; } Only in bmake-beta/: make-bootstrap.sh diff bmake-beta/make-bootstrap.sh.in bmake/make-bootstrap.sh.in 5d4 < prefix=@prefix@ Only in bmake-beta/: makefile diff bmake-beta/make.h bmake/make.h 199,205d198 < * IRIX defines OP_NONE in sys/fcntl.h < */ < #if defined(OP_NONE) < # undef OP_NONE < #endif < < /* Common subdirectories: bmake-beta/missing and bmake/missing Common subdirectories: bmake-beta/mk and bmake/mk Common subdirectories: bmake-beta/PSD.doc and bmake/PSD.doc Only in bmake-beta/: sigcompat.o Common subdirectories: bmake-beta/unit-tests and bmake/unit-tests diff bmake-beta/VERSION bmake/VERSION 2c2 < _MAKE_VERSION=20230711 --- > _MAKE_VERSION=20230622