simplify the test for build setup.h being out of date (do it as in the patch 1752567...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/mac/pbsetup-sh b/distrib/mac/pbsetup-sh
index e8a671614cd587129346a0175836955d1507c358..e6a4f6909b8e103f9ef074b07611b2b124167c79 100755 (executable)
--- a/distrib/mac/pbsetup-sh
+++ b/distrib/mac/pbsetup-sh
@@ -49,16 +49,13 @@ if [ "${1}/../include/wx/mac/setup0.h" -nt "${1}/../include/wx/mac/setup.h" ] ;
     echo "${0}:${LINENO}: warning: edit or replace \"include/wx/mac/setup.h\" to integrate changes"
 fi
 #
     echo "${0}:${LINENO}: warning: edit or replace \"include/wx/mac/setup.h\" to integrate changes"
 fi
 #

-# Copy user setup.h to build setup.h if newer or non existant
+# Copy user setup.h to build setup.h if the latter doesn't exist or is older

 #
 #

-if [ ! -f "${2}/include/wx/setup.h" ] ; then
+if [ ! -f "${2}/include/wx/setup.h" -o \
+     "${1}/../include/wx/mac/setup.h" -nt "${2}/include/wx/setup.h" ] ; then 

     cp "${1}/../include/wx/mac/setup.h" "${2}/include/wx/setup.h"
     cp "${1}/../include/wx/mac/setup.h" "${2}/include/wx/setup.h"

-else
-    if [ "${1}/../include/wx/mac/setup.h" -nt "${2}/include/wx/setup.h" ] ; then
-        cp "${1}/../include/wx/mac/setup.h" "${2}/include/wx/setup.h"
+    if [ ! -f "${2}/include/wx/setup.h" ] ; then
+        echo "${0}:${LINENO}: error: unable to create target setup file \"${2}/include/wx/setup.h\""
+        exit 1

     fi
 fi
     fi
 fi

-if [ ! -f "${2}/include/wx/setup.h" ] ; then
-    echo "${0}:${LINENO}: error: unable to create target setup file \"${2}/include/wx/setup.h\""
-    exit 1
-fi