Smoke: decoupling of wavelet #2, new noise strength option on gui, fftw3 option in...

[blender.git] / release / Makefile

diff --git a/release/Makefile b/release/Makefile
index 43a369d8f77f10377673ee62e029b67237062e8c..24827014b16e7e7d1111195f6fd630c349a2403f 100644 (file)
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,5 @@
-#
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
 # $Id$
 #
 # ***** BEGIN GPL LICENSE BLOCK *****
@@ -163,6 +164,15 @@ endif
        @echo "----> Copy python infrastructure"
        @[ ! -d scripts ] || cp -r scripts $(CONFDIR)/scripts
 
+       @echo "----> Copy python UI files"
+       @[ ! -d ui ] || cp -r ui $(CONFDIR)/ui
+       
+    ifeq ($(OS),darwin)
+       @echo "----> Copy python modules"
+       @mkdir $(CONFDIR)/python/
+       @unzip -q $(LCGDIR)/release/python.zip -d $(CONFDIR)/python/    
+    endif
+
     ifeq ($(OS),darwin)
        @echo "----> Move .blender to .app/Contents/MacOS/"
        @rm -fr $(DISTDIR)/blender$(EXT0)/Contents/MacOS/.blender
@@ -176,7 +186,7 @@ endif
       else
        @strip -x $(DISTDIR)/blender$(EXT0)
        @if [ -f $(DISTDIR)/blenderplayer$(EXTO) ]; then \
-           strip -x $(DISTDIR)/blender$(EXT0) ; \
+           strip -x $(DISTDIR)/blenderplayer$(EXT0) ; \
        fi
       endif
     endif
@@ -197,16 +207,16 @@ pkg: install
        @$(COMPRESS) $(COMPRESSFLAGS) $(NAN_OBJDIR)/$(VERSION)/$(BLENDNAME)$(EXT1)
     endif
        @#echo "****> Clean up temporary distribution directory"
-       @rm -fr $(DISTDIR)
+       @#rm -fr $(DISTDIR)
        @echo "****> $(NAN_OBJDIR)/$(VERSION)/$(BLENDNAME)$(EXT1)$(EXT2) is ready"
 
 version: FORCE
        @echo "*---> Create $(BLENDNAME) package"
 
 makedirs: FORCE
-       @#echo "****> Create package directory $(VERSION) if necessary"
+       @echo "****> Create package directory $(VERSION) if necessary"
        @[ -d $(NAN_OBJDIR)/$(VERSION) ] || mkdir $(NAN_OBJDIR)/$(VERSION)
-       @#echo "****> Prepare temporary distribution directory"
+       @echo "****> Remove and recreate temporary distribution directory"
        @rm -fr $(DISTDIR)
        @mkdir $(DISTDIR)