From 3ff435ef8b7848997321a134c3c229a1a11b5896 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Mon, 23 Feb 2004 22:49:26 +0000
Subject: 	* macosx/Makefile: ensure that xcodebuild will use the 
 Wish.pbproj project even if a .xcode project is also present.

---
 ChangeLog       | 3 +++
 macosx/Makefile | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 265ec73..ae3297b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-23  Daniel Steffen  <das@users.sourceforge.net>
 
+	* macosx/Makefile: ensure that xcodebuild will use the
+	Wish.pbproj project even if a .xcode project is also present.
+
 	* macosx/tkMacOSXMouseEvent.c: fixed modifiers for MouseWheel events.
 
 	* macosx/Wish.pbproj/project.pbxproj:
diff --git a/macosx/Makefile b/macosx/Makefile
index f10e7ba..9cd14b0 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -3,7 +3,7 @@
 # Makefile to build AquaTk on Mac OS X packaged as a Framework
 #	uses Project Builder command line tool 'pbxbuild'
 #
-# RCS: @(#) $Id: Makefile,v 1.12 2004/01/27 10:09:37 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.13 2004/02/23 22:49:26 das Exp $
 #
 ################################################################################
 
@@ -40,8 +40,8 @@ PBXBUILD		= /usr/bin/pbxbuild
 XCODEBUILD		= /usr/bin/xcodebuild
 
 BUILDCMD		= `if [ -f $(XCODEBUILD) ]; then \
-				echo "$(XCODEBUILD)"; \
-			  	else echo "$(PBXBUILD)"; fi`
+			    echo "$(XCODEBUILD) -project $$(ls -d *.pbproj)"; \
+			    else echo "$(PBXBUILD)"; fi`
 
 MAKE_VARS		:= SYMROOT OBJROOT BINDIR APPLICATION_INSTALL_PATH \
 				TCL_FRAMEWORK_DIR TCLSH_DIR
-- 
cgit v0.12