From bf2e5762dc46a7d11d617a7574dc7aa376ce571a Mon Sep 17 00:00:00 2001
From: Hans Lambermont <hans@lambermont.dyndns.org>
Date: Tue, 11 Feb 2003 12:35:18 +0000
Subject: [PATCH] - glue top level makefile and release one together - fix 8
 spaces problem in release/Makefile

---
 Makefile         |  7 ++++++-
 release/Makefile | 22 ++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 58770c7c1f7..f6908f88470 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,12 @@
 
 export NANBLENDERHOME=$(shell pwd)
 MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
-include source/nan_subdirs.mk
 
 SOURCEDIR = blender
 DIRS = extern intern source
+include source/nan_subdirs.mk
+
+.PHONY: release
+release:
+	@echo "====> $(MAKE) $@ in $(SOURCEDIR)/$@" ;\
+	    $(MAKE) -C $@ $@ || exit 1;
diff --git a/release/Makefile b/release/Makefile
index f6d5a7c4c89..96dd09a208c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -36,6 +36,8 @@ export VERSION := $(shell cat VERSION)
 BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)$(TYPE)
 export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME)
 
+release: all
+
 all:
     ifeq ($(OS),beos)
 	@$(MAKE) pkg TYPE="" TAR="zip -ry9" EXT1=".zip" NOPLUGINS="true"
@@ -114,19 +116,19 @@ install: package
     ifeq ($(TYPE),-static)
 	@cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0)
     else
-        ifeq ($(OS),darwin)
-	    @cp -r $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
-        else
-	    @cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
-        endif
+    ifeq ($(OS),darwin)
+	@cp -r $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
+    else
+	@cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0)
+    endif
     endif
     ifneq ($(NOSTRIP),true)
 	@echo "----> Strip blender executable"
-        ifeq ($(OS),darwin)
-	    @strip $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender
-        else
-	    @strip $(DISTDIR)/blender$(EXT0)
-        endif
+      ifeq ($(OS),darwin)
+	@strip $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender
+      else
+	@strip $(DISTDIR)/blender$(EXT0)
+      endif
     endif
 	@[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
 	    echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \