From 0733dc7e4036f62ecfe0cd6dccc437882c052f57 Mon Sep 17 00:00:00 2001 From: "kairo%kairo.at" Date: Thu, 7 Jun 2007 19:36:01 +0000 Subject: [PATCH] part of bug 383085 - remove the need to build xpfe/bootstrap for Camino, fool tinderboxen to still find a mozilla-bin though, r=mento --- camino/Makefile.in | 11 +++++++++++ camino/build.mk | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/camino/Makefile.in b/camino/Makefile.in index c445d8f142f..97d878bbe41 100644 --- a/camino/Makefile.in +++ b/camino/Makefile.in @@ -100,3 +100,14 @@ libs repackage:: # convenience target for PB script build phases echo_srcdir: @echo $(srcdir) + + +# XXX the parts below are a hack to make old tinderbox scripts find a non-zero, executable mozilla-bin +libs:: $(PROGRAM) + mkdir -p $(DIST)/Mozilla.app/Contents/MacOS + echo "I'm just fooling an old tinderbox script" > $(DIST)/Mozilla.app/Contents/MacOS/mozilla-bin + chmod a+x $(DIST)/Mozilla.app/Contents/MacOS/mozilla-bin + +clean clobber:: + rm -rf $(DIST)/Mozilla.app + diff --git a/camino/build.mk b/camino/build.mk index 0ba3a940d20..07f39ae4c4a 100644 --- a/camino/build.mk +++ b/camino/build.mk @@ -49,10 +49,6 @@ ifdef MOZ_BRANDING_DIRECTORY tier_app_dirs += $(MOZ_BRANDING_DIRECTORY) endif -# TODO: remove this, since it's only needed by confused tinderbox and -# packaging scripts. -tier_app_dirs += xpfe/bootstrap - tier_app_dirs += \ embedding/config \ camino \