From abd2a37f8a07f9dfe440ff6760ccbf2bd43d38bc Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Wed, 30 Apr 2003 17:18:34 +0000
Subject: [PATCH] Moved the compiling plugins to after the binary is copied
 over. (macosX needs the binary to link against for the plugins)

Also updated the plugins/Makefile to use
$(MAKE) -C dir
	instead of
cd dir; make

Kent
---
 release/Makefile         | 16 ++++++++--------
 release/plugins/Makefile |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 265b51316e1..e0c3fe8fbe8 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -104,14 +104,6 @@ install: package
 #@cp -r python $(DISTDIR)/python
 #@rm -fr $(DISTDIR)/python/CVS
 
-    ifneq ($(NOPLUGINS),true)
-	@echo "----> Copy and compile plugins"
-	@cp -r plugins $(DISTDIR)/plugins
-	@chmod 755 $(DISTDIR)/plugins/bmake
-	@$(MAKE) -C $(DISTDIR)/plugins all > /dev/null || exit 1;
-	@rm -fr $(DISTDIR)/plugins/CVS $(DISTDIR)/plugins/*/CVS \
-	     $(DISTDIR)/plugins/*/*.o
-    endif
 	@echo "----> Copy blender$(EXT0) executable"
     ifeq ($(TYPE),-static)
 	@cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0)
@@ -122,6 +114,14 @@ install: package
 	@cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
     endif
     endif
+    ifneq ($(NOPLUGINS),true)
+	@echo "----> Copy and compile plugins"
+	@cp -r plugins $(DISTDIR)/plugins
+	@chmod 755 $(DISTDIR)/plugins/bmake
+	@$(MAKE) -C $(DISTDIR)/plugins all  > /dev/null || exit 1;
+	@rm -fr $(DISTDIR)/plugins/CVS $(DISTDIR)/plugins/*/CVS \
+             $(DISTDIR)/plugins/*/*.o
+    endif
     ifneq ($(NOSTRIP),true)
 	@echo "----> Strip blender executable"
       ifeq ($(OS),darwin)
diff --git a/release/plugins/Makefile b/release/plugins/Makefile
index bef7c7b5e17..db013d6e08e 100644
--- a/release/plugins/Makefile
+++ b/release/plugins/Makefile
@@ -32,11 +32,11 @@
 all: textures sequences
 
 textures:
-	cd texture; make;
+	$(MAKE) -C texture
 
 sequences:
-	cd sequence; make;
+	$(MAKE) -C sequence
 
 clean:
-	cd texture; make clean;
-	cd sequence; make clean;
+	$(MAKE) -C texture clean
+	$(MAKE) -C sequence clean