From 1c5eeec392715bba24276ca58ef479ab6a37d48f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin <vadim@wxwidgets.org> Date: Sun, 15 Jul 2007 20:49:45 +0000 Subject: [PATCH] simplify the test for build setup.h being out of date (do it as in the patch 1752567 for consistency with 2.8) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/mac/pbsetup-sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/distrib/mac/pbsetup-sh b/distrib/mac/pbsetup-sh index e8a671614c..e6a4f6909b 100755 --- 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 # -# 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" -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 -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 -- 2.45.2