diff options
| author | jeremiah sypult <jeremiah@sypult.com> | 2013-07-18 11:29:23 -0500 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:33 +0100 |
| commit | 856665c109d6a2ea79f223d680771e3040e43d15 (patch) | |
| tree | 581e15e523bc0100992ba6db2b35424d88ae9541 /Makefile | |
| parent | 477843a15c4277b81d75c4779106b5c9a81cb866 (diff) | |
Makefile builds fall back to traditional archiving when Mac OS X application bundle generation fails
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -1154,9 +1154,6 @@ endif NAKED_TARGETS=$(shell echo $(TARGETS) | sed -e "s!$(B)/!!g") -#MACOSX_TARGET_STRING=$(shell if [ "$(B)" == "$(BR)" ]; then echo "release"; elif [ "$(B)" == "$(BD)" ]; then echo "debug"; fi) -MACOSX_MAKE_APP=@if [ -x "./make-macosx-app.sh" ]; then "./make-macosx-app.sh" release $(ARCH); fi - print_list=@for i in $(1); \ do \ echo " $$i"; \ @@ -1213,9 +1210,7 @@ endif $(B).zip: $(TARGETS) ifeq ($(PLATFORM),darwin) ifdef ARCHIVE - $(call MACOSX_MAKE_APP) - @rm -f $@ - @(if [ -d "$(B)/tremulous.app" ]; then cd $(B) && zip --symlinks -r9 ../../$@ `find "tremulous.app" -print | sed -e "s!$(B)/!!g"`; fi) + @("./make-macosx-app.sh" release $(ARCH); if [ "$$?" -eq 0 ] && [ -d "$(B)/tremulous.app" ]; then rm -f $@; cd $(B) && zip --symlinks -r9 ../../$@ `find "tremulous.app" -print | sed -e "s!$(B)/!!g"`; else rm -f $@; cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS); fi) endif endif ifneq ($(PLATFORM),darwin) |