From: Jan Nieuwenhuizen Date: Thu, 24 Oct 2002 15:50:09 +0000 (+0000) Subject: Correction for broken /bin/sh. X-Git-Tag: release/1.6.6_1~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1cdef593f3e2372950ddf76e4126f58ac04ea6ab;p=lilypond.git Correction for broken /bin/sh. --- diff --git a/ChangeLog b/ChangeLog index 97f77a2738..40e3bc44dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-10-24 Jan Nieuwenhuizen + + * Documentation/topdocs/INSTALL.texi: Correction for broken /bin/sh. + 2002-10-24 Han-Wen Nienhuys * Documentation/user/music-glossary.tely: fix links. @@ -12,6 +16,9 @@ 2002-10-21 Jan Nieuwenhuizen + * stepmake/aclocal.m4: Changed 6 instances of $( ) to ` `, for + Solaris7, as we don't use nested $( ) constructs. + * Documentation/topdocs/INSTALL.texi: Add note about using ksh for as workaround for /bin/sh problems on Solaris7. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index c96536c400..2ff60036d3 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -730,11 +730,11 @@ CFLAGS='-I /usr/pkg/include' LDFLAGS='-L/usr/pkg/lib' ./configure @file{/bin/sh} is not yet POSIX compliant, but @file{/bin/ksh} or bash is. Please run configure like: @example - /bin/ksh -c ./configure + CONFIG_SHELL=/bin/ksh ksh -c ./configure @end example or @example - bash -c ./configure + CONFIG_SHELL=/bin/bash bash -c ./configure @end example @item Sparc64/Solaris 2.6, GNU make-3.77 diff --git a/aclocal.m4 b/aclocal.m4 index e8de7ce992..d96f454e52 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ dnl aclocal.m4 -*-shell-script-*- dnl WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from /users/hanwen/usr/src/lilypond-stable/stepmake/aclocal.m4 +dnl do not edit! this is aclocal.m4, generated from /home/fred/lily-1.6/stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -250,10 +250,10 @@ AC_DEFUN(STEPMAKE_DATADIR, [ local_package_datadir=$package_datadir/$FULL_VERSION build_package_datadir=$builddir/share/$package - DATADIR=$(echo ${datadir} | sed "s!\\\${prefix}!$presome!") - PACKAGE_DATADIR=$(echo ${package_datadir} | sed "s!\\\${prefix}!$presome!") - LOCAL_PACKAGE_DATADIR=$(echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!") - BUILD_PACKAGE_DATADIR=$(echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!") + DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"` + PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"` + LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"` + BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"` AC_SUBST(datadir) AC_SUBST(package_datadir) @@ -344,7 +344,7 @@ AC_DEFUN(STEPMAKE_GETTEXT, [ if test "$prefix" = "NONE"; then presome=${ac_default_prefix} fi - LOCALEDIR=$(echo ${localedir} | sed "s!\\\${prefix}!$presome!") + LOCALEDIR=`echo ${localedir} | sed "s!\\\${prefix}!$presome!"` AC_SUBST(localedir) AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}") @@ -565,16 +565,18 @@ AC_DEFUN(STEPMAKE_INIT, [ STEPMAKE_PROGS(TAR, tar, REQUIRED) - if test "x`uname`" = "xHP-UX"; then - AC_PATH_PROG(BASH, bash, /bin/sh) + if test "$(echo 2)" != "2" || + test "x`uname`" = "xHP-UX"; then + AC_PATH_PROG(KSH, ksh, /bin/ksh) + AC_PATH_PROG(BASH, bash, $KSH) STEPMAKE_WARN(avoiding buggy /bin/sh) - AC_PATH_PROG(SHELL, bash, /bin/ksh) + AC_PATH_PROG(SHELL, bash, $KSH) else - AC_PATH_PROG(BASH, bash, /bin/sh) SHELL=/bin/sh - AC_SUBST(SHELL) + AC_PATH_PROG(BASH, bash, $SHELL) fi - + AC_SUBST(SHELL) + STEPMAKE_PATH_PROG(PYTHON, python, REQUIRED) if expr "$MAKE" : '.*\(echo\)' >/dev/null; then @@ -693,7 +695,7 @@ AC_DEFUN(STEPMAKE_LIBTOOL, [ REVISION=$PATCH_LEVEL # CURRENT=$MINOR_VERSION CURRENT=`expr $MINOR_VERSION + 1` - # AGE=$(expr $MAJOR_VERSION + 1) + # AGE=`expr $MAJOR_VERSION + 1` AGE=$MAJOR_VERSION AC_SUBST(CURRENT) AC_SUBST(REVISION) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 3a3257072d..603ea8b49d 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -247,10 +247,10 @@ AC_DEFUN(STEPMAKE_DATADIR, [ local_package_datadir=$package_datadir/$FULL_VERSION build_package_datadir=$builddir/share/$package - DATADIR=$(echo ${datadir} | sed "s!\\\${prefix}!$presome!") - PACKAGE_DATADIR=$(echo ${package_datadir} | sed "s!\\\${prefix}!$presome!") - LOCAL_PACKAGE_DATADIR=$(echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!") - BUILD_PACKAGE_DATADIR=$(echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!") + DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"` + PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"` + LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"` + BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"` AC_SUBST(datadir) AC_SUBST(package_datadir) @@ -341,7 +341,7 @@ AC_DEFUN(STEPMAKE_GETTEXT, [ if test "$prefix" = "NONE"; then presome=${ac_default_prefix} fi - LOCALEDIR=$(echo ${localedir} | sed "s!\\\${prefix}!$presome!") + LOCALEDIR=`echo ${localedir} | sed "s!\\\${prefix}!$presome!"` AC_SUBST(localedir) AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}") @@ -562,16 +562,18 @@ AC_DEFUN(STEPMAKE_INIT, [ STEPMAKE_PROGS(TAR, tar, REQUIRED) - if test "x`uname`" = "xHP-UX"; then - AC_PATH_PROG(BASH, bash, /bin/sh) + if test "$(echo 2)" != "2" || + test "x`uname`" = "xHP-UX"; then + AC_PATH_PROG(KSH, ksh, /bin/ksh) + AC_PATH_PROG(BASH, bash, $KSH) STEPMAKE_WARN(avoiding buggy /bin/sh) - AC_PATH_PROG(SHELL, bash, /bin/ksh) + AC_PATH_PROG(SHELL, bash, $KSH) else - AC_PATH_PROG(BASH, bash, /bin/sh) SHELL=/bin/sh - AC_SUBST(SHELL) + AC_PATH_PROG(BASH, bash, $SHELL) fi - + AC_SUBST(SHELL) + STEPMAKE_PATH_PROG(PYTHON, python, REQUIRED) if expr "$MAKE" : '.*\(echo\)' >/dev/null; then @@ -690,7 +692,7 @@ AC_DEFUN(STEPMAKE_LIBTOOL, [ REVISION=$PATCH_LEVEL # CURRENT=$MINOR_VERSION CURRENT=`expr $MINOR_VERSION + 1` - # AGE=$(expr $MAJOR_VERSION + 1) + # AGE=`expr $MAJOR_VERSION + 1` AGE=$MAJOR_VERSION AC_SUBST(CURRENT) AC_SUBST(REVISION)