From 75ea167ce25e7833909a8c33f756863c6f4102e9 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 26 Feb 2012 17:32:53 +0000
Subject: [PATCH] Fix osxbuild.sh on my setup.

git-svn-id: https://svn.eduke32.com/eduke32@2388 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile    | 15 ++++++++++-----
 polymer/eduke32/osxbuild.sh |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index 0e93f91de..14edd21ce 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -287,8 +287,9 @@ ifeq (1,$(RELEASE))
   endif
 endif
 ifeq ($(PLATFORM),DARWIN)
-    cp -f "Apple/bundles/EDuke32.app" "./"
-    mv -f "eduke32$(EXESUFFIX)" "EDuke32.app/Contents/MacOS/"
+	cp -rf "Apple/bundles/EDuke32.app" "./"
+	mkdir -p "EDuke32.app/Contents/MacOS"
+	cp -f "eduke32$(EXESUFFIX)" "EDuke32.app/Contents/MacOS/"
 endif
 
 mapster32$(EXESUFFIX): $(EDITOROBJS) $(EOBJ)/$(EDITORLIB) $(EOBJ)/$(ENGINELIB) $(JAUDIOLIBDIR)/$(JAUDIOLIB)
@@ -300,8 +301,9 @@ ifeq (1,$(RELEASE))
   endif
 endif
 ifeq ($(PLATFORM),DARWIN)
-    cp -f "Apple/bundles/Mapster32.app" "./"
-    mv -f "mapster32$(EXESUFFIX)" "Mapster32.app/Contents/MacOS/"
+	cp -rf "Apple/bundles/Mapster32.app" "./"
+	mkdir -p "Mapster32.app/Contents/MacOS"
+	cp -f "mapster32$(EXESUFFIX)" "Mapster32.app/Contents/MacOS/"
 endif
 
 include Makefile.deps
@@ -410,7 +412,10 @@ $(RSRC)/editor_banner.c: $(RSRC)/build.bmp
 # PHONIES	
 
 clean:
-	-rm -f $(OBJ)/* eduke32$(EXESUFFIX) eduke32$(EXESUFFIX).memmap EDuke32.app mapster32$(EXESUFFIX) mapster32$(EXESUFFIX).memmap Mapster32.app core* duke3d_w32$(EXESUFFIX) && $(MAKE) -C $(JAUDIOLIBDIR) clean && $(MAKE) -C $(ENETDIR) clean
+	-rm -f $(OBJ)/* eduke32$(EXESUFFIX) eduke32$(EXESUFFIX).memmap mapster32$(EXESUFFIX) mapster32$(EXESUFFIX).memmap core* duke3d_w32$(EXESUFFIX) && $(MAKE) -C $(JAUDIOLIBDIR) clean && $(MAKE) -C $(ENETDIR) clean
+ifeq ($(PLATFORM),DARWIN)
+	-rm -rf EDuke32.app Mapster32.app
+endif
 	echo -n "" > $(OBJ)/keep.me
 
 veryclean: clean
diff --git a/polymer/eduke32/osxbuild.sh b/polymer/eduke32/osxbuild.sh
index ea076b05b..099c0e42f 100755
--- a/polymer/eduke32/osxbuild.sh
+++ b/polymer/eduke32/osxbuild.sh
@@ -91,7 +91,7 @@ fi
 # fi
 
 # Almost done...
-if [ -f mapster32.x64 ] && [ -f eduke32.x86 ] && [ -f eduke32.ppc ]; then
+if [ -f mapster32.x64 ] && [ -f eduke32.x86 ]; then # && [ -f eduke32.ppc ]; then
     echo Creating fat binaries.
 
     lipo -create mapster32.x64 mapster32.x86  -output mapster32