From c9caca1b15410efd65dba3baa9d7dcfa22c81ebc Mon Sep 17 00:00:00 2001 From: "joshmoz%gmail.com" Date: Wed, 8 Jun 2005 02:50:56 +0000 Subject: [PATCH] build on Xcode 2.1 which uses per-build configuration build directories. b=296900 r=josh r=cls r=bsmedberg a=bsmedberg git-svn-id: svn://10.0.0.236/trunk@174270 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/config.mk | 6 ++++++ mozilla/modules/plugin/samples/default/mac/Makefile.in | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 0a7040698ad..f9147768cef 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -743,6 +743,12 @@ ifeq (2,$(MOZ_OPTIMIZE)) PBBUILD_SETTINGS += GCC_MODEL_TUNING= OPTIMIZATION_CFLAGS="$(MOZ_OPTIMIZE_FLAGS)" endif # MOZ_OPTIMIZE=2 endif # MOZ_OPTIMIZE +ifneq (,$(findstring xcodebuild,$(PBBUILD))) +# Tell Xcode 2.1 to put its build products where earlier versions of Xcode +# and Project Builder did. This gets set when using earlier Xcodes as well, +# but "build" is the default in that case. +PBBUILD_SETTINGS += TARGET_BUILD_DIR=build BUILT_PRODUCTS_DIR=build +endif # PBBUILD contains "xcodebuild" endif # OS_ARCH=Darwin diff --git a/mozilla/modules/plugin/samples/default/mac/Makefile.in b/mozilla/modules/plugin/samples/default/mac/Makefile.in index a563ef2b0d1..aae87c228ac 100644 --- a/mozilla/modules/plugin/samples/default/mac/Makefile.in +++ b/mozilla/modules/plugin/samples/default/mac/Makefile.in @@ -92,19 +92,16 @@ export:: ln -fs $(srcdir)/Info-*.plist . endif -all:: build-plugin - libs install:: install-plugin install-plugin: build-plugin $(INSTALL) "build/Default Plugin.plugin" $(DIST)/bin/plugins - $(INSTALL) "build/DefaultPlugin.build/Default Plugin.build/PkgInfo" "$(DIST)/bin/plugins/Default Plugin.plugin/Contents" resources: $(RESOURCE_FILES) build-plugin: resources $(PBBUILD) $(PROJECT_ARG) -target $(TARGET) -buildstyle $(BUILDSTYLE) $(PBBUILD_ARG) - echo -n NSPLMOSS > "build/DefaultPlugin.build/Default Plugin.build/PkgInfo" + echo -n NSPLMOSS > "build/Default Plugin.plugin/Contents/PkgInfo" _%.rsrc: %.rsrc $(ASDECODE) $< $@