a few tweaks to make sure everything is assembling

svn path=/trunk/; revision=3995

2 files changed, 13 insertions, 18 deletions

diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 84b74424..84110594 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -82,7 +82,8 @@ darwin_app_core: darwin_app_wrapper
 	cd $(PACKAGES_SRC) && \
 		make $(DEST_PATHS) PD_CONFIGURE_FLAGS=--enable-jack pd_install 
 # tigital's Gem window focus black magic:
-	/Developer/tools/Rez -t APPL mac.r -o $(BIN_DEST)/pd
+	install -p $(CWD)/mac.r $(BIN_DEST)
+	cd $(BIN_DEST) && /Developer/tools/Rez -t APPL mac.r -o pd
 	cd "$(PD_APP_CONTENTS)/Resources/Scripts" && \
 		ln -s ../bin/pd.tk AppMain.tcl
 # support for Info Panel Plugins mgmt
@@ -274,21 +275,21 @@ darwin_app_noncvs:
 	test -d noncvs/doc/5.reference && \
 		install -p noncvs/doc/5.reference/*.* $(HELP_DEST)
 	test -d noncvs/extra && install -p noncvs/extra/*.* $(OBJECTS_DEST)
-	test -d noncvs/doc/serendipd && cp -Rp noncvs/doc/serendipd $(DOCS_DEST)
+	test -d noncvs/doc/serendipd && cp -Rp noncvs/doc/serendipd \
+		$(APPLICATIONS_DEST)
 
 darwin_app_perms:
 	chmod a-x $(DOCS_DEST)/*/*.pd $(DOCS_DEST)/*/*/*.pd $(DOCS_DEST)/*/*/*/*.pd
 	chmod -R a-w $(DOCS_DEST)
 # serendiPd shared patch
-	test -d $(DOCS_DEST)/serendipd && \
-		chmod a+w $(DOCS_DEST)/serendipd/*shared_patch.pd
+	test -d $(APPLICATIONS_DEST)/serendipd && \
+		chmod a+w $(APPLICATIONS_DEST)/serendipd/*shared_patch.pd
 
-dmg: darwin_app_readme darwin_app_welcome darwin_app_license darwin_app_perms
+dmg: darwin_app_perms
 	install -d "$(CWD)/$(DMG_NAME)"
 	cd $(BUILD_BASE) && mv $(PD_APP_NAME).app "$(CWD)/$(DMG_NAME)/$(DMG_NAME).app"
-	install -p -m0444 $(PD_SRC)/LICENSE.txt "$(CWD)/$(DMG_NAME)/PD LICENSE.txt"
-	install -p -m0444 $(LICENSE_FILE) $(README_FILE) \
-		$(WELCOME_FILE) $(LICENSE_FILE)   "$(CWD)/$(DMG_NAME)"
+	install -p -m0444 $(INSTALL_PREFIX)/*.txt $(INSTALL_PREFIX)/*.html  \
+		"$(CWD)/$(DMG_NAME)"
 	cd $(CWD) && /bin/sh mkdmg "$(DMG_NAME)"
 
 
diff --git a/packages/darwin_app/TODO b/packages/darwin_app/TODO
index f20961a3..108c0481 100644
--- a/packages/darwin_app/TODO
+++ b/packages/darwin_app/TODO
@@ -1,4 +1,6 @@
 
+- check to make sure that Rez mac.r is working in Makefile
+
 - make Pd open a new window when its launched to workaround the bug where the
   menus don't work until a window is opened.
 
@@ -7,16 +9,8 @@
 - add symbolic link for flext 
   (cd Pd.app/Contents/Resources/extra && ln -s . lib)
 
-- explore Pd.app/Contents/Plugins with "Get Info" installation for externals
-  (just make it a symlink to Resources/extra)
-
 - from Carmen Rocco about [fiddle~] crash: "is fiddle~: * compiled with the same header * linked with the same binary of (lib)pd * compiled with the same compiler? i had very similar issues with bonk on windows (Virtually same stacktrace but s/fiddle/bonk) until fixing the above 3 things..."
 
-- test for noncvs locations before copying to prevent show-stopping errors
-
-- investigate moving pd binary to Contents/MacOS to solve GEM window not
-  getting focus, i.e. no symlink, make it the real binary location
-
 - review permissions so that you can build on top on existing builds
 
 - add standard paths to included org.puredata.pd.plist following these
@@ -54,8 +48,8 @@ http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/Articles
 		   Finder key command habits work in Pd as well
 		 - make Cmd-click work like Ctrl-click
 
-- convert from -DMACOSX to -D__APPLE__ where ever possible (check out
-  __gnu_linux__) while I am at it
+- write script to convert from -DMACOSX to -D__APPLE__ where ever possible (check out
+  __gnu_linux__ while I am at it) and submit to miller
 
 - instead of shipping Pd.app with a org.puredata.pd.plist, make a script that
   uses the "defaults" command to add the desired prefs to any existing