From 98a04b4a2a5fc24ad5ebbd6f80338808421029af Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 31 Aug 2008 16:29:11 +0000 Subject: [PATCH] test for utils/wxrc/Makefile existence and not utils/wxrc which always exists when building in source directory (#9928) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 6 +++--- build/bakefiles/wx.bkl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 28f21dc53f..a9683c371b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12865,13 +12865,13 @@ samples: (cd samples && $(MAKE) all) @COND_USE_XRC_1@wxrc: $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__xmldll___depname) $(__xmllib___depname) -@COND_USE_XRC_1@ (if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) all ; fi) +@COND_USE_XRC_1@ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(MAKE) all ; fi) @COND_USE_XRC_1@clean-wxrc: -@COND_USE_XRC_1@ (if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) clean ; fi) +@COND_USE_XRC_1@ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(MAKE) clean ; fi) @COND_USE_XRC_1@install-wxrc: $(__wxrc___depname) -@COND_USE_XRC_1@ (if test -d utils/wxrc ; then cd utils/wxrc && $(MAKE) install ; fi) +@COND_USE_XRC_1@ (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(MAKE) install ; fi) install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(bindir) diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index 28d65333d6..58e38626de 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -61,20 +61,20 @@ xmllib - (if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi) + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) all ; fi) clean - (if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi) + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) clean ; fi) install wxrc - (if test -d utils/wxrc ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi) + (if test -f utils/wxrc/Makefile ; then cd utils/wxrc && $(DOLLAR)(MAKE) install ; fi)