diff options
author | Kent Mein <mein@cs.umn.edu> | 2003-04-30 21:18:34 +0400 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2003-04-30 21:18:34 +0400 |
commit | abd2a37f8a07f9dfe440ff6760ccbf2bd43d38bc (patch) | |
tree | 45bcc1431f7988f937b96e3363dfa1890aff08a5 /release/Makefile | |
parent | 4a3d4472b1664eeb12b7844db210d6f8992ce025 (diff) |
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
Diffstat (limited to 'release/Makefile')
-rw-r--r-- | release/Makefile | 16 |
1 files changed, 8 insertions, 8 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) |