diff options
| author | Jean-Luc Peurière <jlp@nerim.net> | 2006-06-12 21:15:31 +0400 |
|---|---|---|
| committer | Jean-Luc Peurière <jlp@nerim.net> | 2006-06-12 21:15:31 +0400 |
| commit | e65df3e89d4e20151967ce0c7677b3c6de1ac227 (patch) | |
| tree | 53b4670e2565673ff6321a110ccc53d72d9b094b /release | |
| parent | 00e1187a18428e8218443b8cff30b839ce1cfa89 (diff) | |
attempt to fix the release makefiles
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/release/Makefile b/release/Makefile index 8b3331c2556..045ccc2877d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -96,13 +96,12 @@ install: package @[ ! -d $(CONFIG_GUESS)/text ] || \ cp -f $(CONFIG_GUESS)/text/*.txt $(DISTDIR) #on OS X the contents of the .blender dir is already inside the bundle -ifneq ($(OS), darwin) + ifneq ($(OS), darwin) @[ ! -d $(OCGDIR)/bin/.blender ] || \ cp -r $(OCGDIR)/bin/.blender $(DISTDIR) cp $(NANBLENDERHOME)/bin/.blender/.Blanguages $(CONFDIR) cp $(NANBLENDERHOME)/bin/.blender/.bfont.ttf $(CONFDIR) -endif - + endif @echo "----> Copy blender$(EXT0) executable" ifeq ($(TYPE),-static) @cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0) @@ -129,13 +128,12 @@ ifneq ($(NOPLUGINS),true) $(DISTDIR)/plugins/*/*.o #on OS X the plugins move to the installation directory - ifneq ($(OS),darwin) - @mkdir -p $(CONFDIR)/plugins/sequence - @mkdir -p $(CONFDIR)/plugins/texture - - @mv $(DISTDIR)/plugins/sequence/*.so $(CONFDIR)/plugins/sequence - @mv $(DISTDIR)/plugins/texture/*.so $(CONFDIR)/plugins/texture - endif + ifneq ($(OS),darwin) + @mkdir -p $(CONFDIR)/plugins/sequence + @mkdir -p $(CONFDIR)/plugins/texture + @mv $(DISTDIR)/plugins/sequence/*.so $(CONFDIR)/plugins/sequence + @mv $(DISTDIR)/plugins/texture/*.so $(CONFDIR)/plugins/texture + endif endif @echo "----> Copy python infrastructure" |