cleaned things up to make operation clearer; darwin_app_doc_format was having trouble with too many open files, so switched to find with -exec

svn path=/trunk/; revision=5454

2 files changed, 19 insertions, 26 deletions

diff --git a/packages/Makefile b/packages/Makefile
index 06eb08ad..988f66e2 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -302,24 +302,24 @@ devel_install: pd_devel_install
 #------------------------------------------------------------------------------
 # abstractions_install
 abstractions_install:
-	cd $(abstractions_src) && make $(DEST_PATHS) install
+	make -C $(abstractions_src) $(DEST_PATHS) install
 
 #------------------------------------------------------------------------------
 # doc_install
 doc_install: 
-	cd $(doc_src) && make $(DEST_PATHS) install
+	make -C $(doc_src) $(DEST_PATHS) install
 
 
 #------------------------------------------------------------------------------
 # extensions_install
 extensions_install: 
-	cd $(extensions_src) && make $(DEST_PATHS) install
+	make -C $(extensions_src) $(DEST_PATHS) install
 
 
 #------------------------------------------------------------------------------
 # externals_install
 externals_install: 
-	cd $(externals_src) && make $(DEST_PATHS) install
+	make -C $(externals_src) $(DEST_PATHS) install
 
 
 
@@ -500,21 +500,19 @@ gem_install: gem $(helpdir)
 # noncvs_install
 # this is for including pre-compiled binaries in a build
 noncvs_install:
-		-install -p $(packages_src)/noncvs/$(OS_NAME)/bin/*.* $(bindir)
-		-install -p $(packages_src)/noncvs/$(OS_NAME)/doc/5.reference/*.* \
-			$(helpdir)
-		-install -p $(packages_src)/noncvs/$(OS_NAME)/extra/*.* $(objectsdir)
-		-install -d $(DESTDIR)$(prefix)/gripd
-		-install -p $(packages_src)/noncvs/$(OS_NAME)/gripd/*.* \
-			 $(DESTDIR)$(prefix)/gripd
+	-install -p $(packages_src)/noncvs/$(OS_NAME)/bin/*.* $(bindir)
+	-install -p $(packages_src)/noncvs/$(OS_NAME)/doc/5.reference/*.* $(helpdir)
+	-install -p $(packages_src)/noncvs/$(OS_NAME)/extra/*.* $(objectsdir)
+	-install -d $(DESTDIR)$(prefix)/gripd
+	-install -p $(packages_src)/noncvs/$(OS_NAME)/gripd/*.* \
+		$(DESTDIR)$(prefix)/gripd
 
 
 #------------------------------------------------------------------------------
 # pd_install
 PD_NAME=Pd
 pd_install: pd
-	cd $(pd_src)/src && \
-		make $(DEST_PATHS) $(PD_BUILD_FLAGS) install
+	make -C $(pd_src)/src $(DEST_PATHS) $(PD_BUILD_FLAGS) install
 	install -d $(manualsdir)/$(PD_NAME)
 	install -p $(pd_src)/src/notes.txt $(manualsdir)/$(PD_NAME)
 
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index c8bda5d2..7878565f 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -80,7 +80,7 @@ darwin_app_embed_libs
 	@echo "Pd.app build succeeded!"
 
 extended_install:
-	$(MAKE) -C $(packages_src) $(DEST_PATHS) install
+	$(MAKE) -C $(packages_src) $(DEST_PATHS) extended_install
 
 #------------------------------------------------------------------------------#
 darwin_app_devel: darwin_app_devel_core rez_install
@@ -169,8 +169,8 @@ darwin_app_embed_libs:
 
 #------------------------------------------------------------------------------#
 darwin_app_core: darwin_app_wrapper
-	cd $(packages_src) && \
-		$(MAKE) $(DEST_PATHS) PD_CONFIGURE_FLAGS=--enable-jack pd_install 
+	$(MAKE) -C $(packages_src) $(DEST_PATHS) PD_CONFIGURE_FLAGS=--enable-jack \
+		pd_install 
 	cd "$(PD_APP_CONTENTS)/Resources/Scripts" && \
 		ln -s ../bin/pd.tk AppMain.tcl
 # support for Info Panel Plugins mgmt
@@ -193,12 +193,11 @@ darwin_app_devel_core: darwin_app_devel_wrapper
 
 # set the font to 10pt on all help patches
 # the BSD/Darwin version of sed must create a backup file when doing 
-# in-place replacement, so delete the unneeded backup files
+# in-place replacement, so delete the unneeded backup files.
 darwin_app_doc_format:
-	cd $(pddocdir) && \
-		sed -i.bak 's/^\(\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*\) 12/\1 10/' \
-			*/*.pd */*/*.pd */*/*/*.pd
-	find $(DESTDIR) -name '*.pd.bak' -delete
+	find $(pddocdir) -name '*.pd' -exec \
+		sed -i.b 's/^\(\#N canvas [0-9]* [0-9]* [0-9]* [0-9]*\) 12/\1 10/' '{}' \;
+	find $(DESTDIR) -name '*.pd.b' -delete
 
 
 #==============================================================================#
@@ -234,11 +233,7 @@ package: dmg
 DMG_NAME = $(PACKAGE_NAME)
 dmg: darwin_app_perms
 	install -d "$(CWD)/$(DMG_NAME)"
-	install -p -m0644 $(manualsdir)/Pd/Pd-LICENSE.txt \
-		$(manualsdir)/Pd/License.html \
-		$(manualsdir)/Pd/Welcome.html \
-		$(manualsdir)/Pd/ReadMe.html \
-		"$(CWD)/$(DMG_NAME)"
+	install -p -m0644 $(manualsdir)/Pd/ReadMe.html "$(CWD)/$(DMG_NAME)"
 	cd $(BUILD_BASE) && mv $(PD_APP_NAME).app "$(CWD)/$(DMG_NAME)/"
 	install -p -m0644 org.puredata.pd.plist "$(CWD)/$(DMG_NAME)"
 	cd $(CWD) && /bin/sh mkdmg "$(DMG_NAME)"