From 0e29f29c69028a0b688eeb13d50b64c4e0f83682 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 6 Jan 2003 04:30:12 +0000 Subject: Some changes for Bourne shells that don't match NetBSD's feature-set: if ! test ...; then ...; fi becomes: if test ! ...; then ...; fi and if ! command; then ...; fi becomes: if command; then :; else ...; fi This fixes PR 19690 by Frank Cusack . --- mk/buildlink2/libtool-fix-la | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'mk/buildlink2/libtool-fix-la') diff --git a/mk/buildlink2/libtool-fix-la b/mk/buildlink2/libtool-fix-la index 7341b89836c..b53836f66b1 100644 --- a/mk/buildlink2/libtool-fix-la +++ b/mk/buildlink2/libtool-fix-la @@ -1,4 +1,4 @@ -# $NetBSD: libtool-fix-la,v 1.14 2002/12/26 17:08:56 jlam Exp $ +# $NetBSD: libtool-fix-la,v 1.15 2003/01/06 04:30:12 jlam Exp $ # # For *.la files, in the "relink_command" line, we make the following # replacements: @@ -103,8 +103,10 @@ if $test -f $lafile; then ;; esac done - if $test -n "$deps" || $test -n "$relink" && \ - ! @EGREP@ "^#.*modified by buildlink2" $lafile >/dev/null 2>&1; then + if $test -z "$deps" && $test -z "$relink" || \ + @EGREP@ "^#.*modified by buildlink2" $lafile >/dev/null 2>&1; then + : + else @MV@ -f $lafile ${lafile}.blsav if $test -n "$deps"; then ( @@ -129,8 +131,10 @@ if $test -f $lafile; then @RM@ ${lafile}.tmp $echo "==> Fixed $lafile" >> $wrapperlog fi - if $test -n "$laifile" && $test -f "$laifile" && \ - ! @EGREP@ "^#.*modified by buildlink2" $laifile >/dev/null 2>&1; then + if $test -z "$laifile" || $test ! -f "$laifile" || \ + @EGREP@ "^#.*modified by buildlink2" $laifile >/dev/null 2>&1; then + : + else @SED@ @_BLNK_WRAP_LT_UNTRANSFORM_SED@ \ @_BLNK_UNTRANSFORM_SED@ \ $laifile > ${laifile}.tmp -- cgit v1.2.3