From a19cdf6040653cb2d596775972d55b7a0fd70eb6 Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Wed, 15 Mar 2006 14:11:17 +0000
Subject: [PATCH] (svn r3884) renamed TRIPPLE_BINARY to TRIPLE_BINARY

---
 Makefile                 | 4 ++--
 os/macosx/Makefile       | 4 ++--
 os/macosx/Makefile.setup | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 1320fd09e8..9450a7f6f9 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@
 # Special for crosscompiling there are some commands available:
 #
 # UNIVERSAL_BINARY: builds a universal binary for OSX. Make sure you got both PPC and x86 libs. Only works with GCC 4 or newer
-# TRIPPLE_BINARY: builds a universal binary with the addition of code optimised for G5 (which means a total of 3 binaries in one file)
+# TRIPLE_BINARY: builds a universal binary with the addition of code optimised for G5 (which means a total of 3 binaries in one file)
 #
 # JAGUAR: Crosscompiling for OSX 1.2.8 (codenamed Jaguar). Only works if OSX is defined too. Only works with GCC 4 or newer
 #	This can be changed to any PPC version of OSX by changing the ppc flags in Makefile.config
@@ -997,7 +997,7 @@ endif
 	$(Q)$(CC) $(OBJCFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
 
 
-ifndef TRIPPLE_BINARY
+ifndef TRIPLE_BINARY
 # building tripple binary object files is handled in os/macosx/Makefile
 # TARGET_CPU_FLAGS is used to set target CPUs in OSX universal binaries. It's empty for all other builds
 %.o: %.c $(MAKE_CONFIG)
diff --git a/os/macosx/Makefile b/os/macosx/Makefile
index 02a7660e9e..de9a8481df 100644
--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@@ -2,7 +2,7 @@
 # This makefile is not a standalone makefile, but is called from the general one
 # it contains targets specific to MacOS X
 
-ifdef TRIPPLE_BINARY
+ifdef TRIPLE_BINARY
 # this is to add G5_FLAGS to ppc970 builds only. If the ability to add flags to a single arch only shows up in the future
 # we can get rid of this. Xcode supports arch dependant flags, but we can't do it in the makefile (yet?)
 %.o: %.c $(MAKE_CONFIG)
@@ -37,7 +37,7 @@ endif
 # build the bundle. OSX wants to keep apps in bundles, so we will give it one
 # the good thing about bundles is that you can keep extra files in them, so we keep lng files and a data dir in it
 
-$(BUILD_OSX_BUNDLE): $(TTD) $(UNIVERSAL_BINARY) $(TRIPPLE_BINARY)
+$(BUILD_OSX_BUNDLE): $(TTD)
 	@echo '===> Building application bundle'
 	$(Q)rm -fr "$(OSXAPP)"
 	$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup
index d5419900b3..4871e156e6 100644
--- a/os/macosx/Makefile.setup
+++ b/os/macosx/Makefile.setup
@@ -16,7 +16,7 @@ $(warning Compiling a release build, that is not a universal binary)
 endif
 endif
 
-ifdef TRIPPLE_BINARY
+ifdef TRIPLE_BINARY
 ifdef DEBUG
 $(error no G5 optimisation is made in debug builds, so tripple binaries aren't possible. Use UNIVERSAL_BINARY instead if you really want a universal debug build)
 endif
@@ -74,7 +74,7 @@ ifdef UNIVERSAL_BINARY
 TARGET_CPU_FLAGS:= -arch ppc -arch i386
 LDFLAGS := $(LDFLAGS_UNIVERSAL) -arch ppc -arch i386
 CFLAGS += $(CFLAGS_UNIVERSAL)
-ifdef TRIPPLE_BINARY
+ifdef TRIPLE_BINARY
 LDFLAGS += -arch ppc970
 endif
 endif