OSDN Git Service

Correct ill advised use of non-standard shell syntax.
authorKeith Marshall <keithmarshall@users.sourceforge.net>
Tue, 25 Jun 2013 20:36:44 +0000 (21:36 +0100)
committerKeith Marshall <keithmarshall@users.sourceforge.net>
Tue, 25 Jun 2013 20:36:44 +0000 (21:36 +0100)
ChangeLog
Makefile.in

index 7bee564..857a157 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-25  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Correct ill advised use of non-standard shell syntax.
+
+       * Makefile.in (lib%.a): Remove bash/ksh/csh style logic construct;
+       replace it using standard Bourne shell "test" command syntax.
+
 2013-06-21  Mark Brand  <mabrand@mabrand.nl>
 
        * include/time.h: Correct typecasts throughout.
index bde26c3..4356628 100644 (file)
@@ -724,12 +724,12 @@ lib%.a: %.def
        V=`echo $@ | sed -e 's|lib\([a-z]*\)\([0-9]*\).*|\2|'`; \
        DLLNAME="$${N}$${V}.dll"; \
        $(DLLTOOL) $(DLLTOOL_FLAGS) $${DLLNAME} --def $< --output-lib $@ ; \
-       if [[ $${DLLNAME} = msvcrt.dll || \
-             $${DLLNAME} = msvcrtd.dll || \
-             $${DLLNAME} = msvcr70.dll || \
-             $${DLLNAME} = msvcr70d.dll || \
-             $${DLLNAME} = msvcr71.dll || \
-             $${DLLNAME} = msvcr71d.dll ]]; then \
+       if test $${DLLNAME} = msvcrt.dll  \
+           -o  $${DLLNAME} = msvcrtd.dll  \
+           -o  $${DLLNAME} = msvcr70.dll  \
+           -o  $${DLLNAME} = msvcr70d.dll  \
+           -o  $${DLLNAME} = msvcr71.dll  \
+           -o  $${DLLNAME} = msvcr71d.dll; then \
          $(AR) rc $@ src/libcrt/crt/ofmt_stub.o; \
        fi
        $(RANLIB) $@