From a887a529a0dc8ad96f383973e21ea5e138cbe295 Mon Sep 17 00:00:00 2001 From: truelight Date: Sat, 27 May 2006 17:51:11 +0000 Subject: (svn r4989) -Fix: make the OSX Makefile stuff to work with the compile-farm --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 236ea2ca6..85659028f 100644 --- a/Makefile +++ b/Makefile @@ -173,7 +173,7 @@ LANG_ERRORS = >/dev/null 2>&1 endif ifdef OSX --include os/MacOSX/Makefile.setup +-include os/macosx/Makefile.setup endif ifdef STATIC @@ -853,7 +853,7 @@ $(ENDIAN_CHECK): endian_check.c $(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@ -ifndef NATIVE_OSX +ifndef MACOSX_BUILD # OSX links in os/macosx/Makefile to handle universal binaries better $(TTD): $(OBJS) $(MAKE_CONFIG) @echo '===> Linking $@' @@ -1048,7 +1048,7 @@ endif $(Q)$(CC) $(OBJCFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@ -ifndef NATIVE_OSX +ifndef MACOSX_BUILD # OSX uses os/macosx/Makefile to compile files %.o: %.c $(MAKE_CONFIG) @echo '===> Compiling $<' -- cgit v1.2.3-54-g00ecf