diff options
| author | Kent Mein <mein@cs.umn.edu> | 2003-02-03 23:58:21 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2003-02-03 23:58:21 +0300 |
| commit | 9e5f66b8b1d16582e7a1b4fcecc7ab99dbca0ca3 (patch) | |
| tree | 2b26d9745a311afb77f33f7f89f90cfb182bbb47 | |
| parent | f8ae7db9aa64c8daefa1be1b380715798517e7b3 (diff) | |
Ok this should fix up make inside of blender/release
you can also do a make release inside of blender/source
Should this be moved to the rootdir or do we want it sort of hidden?
Also I only tested it on linux so feel free to give it a shot it probably will
need some tweaks for other platforms but hey :)
I set VERSION to 2.26a wasn't sure what we want it to be.
Kent
| -rw-r--r-- | release/Makefile | 9 | ||||
| -rw-r--r-- | release/VERSION | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/release/Makefile b/release/Makefile index 69554ff5921..efe31905a76 100644 --- a/release/Makefile +++ b/release/Makefile @@ -29,7 +29,7 @@ # # ***** END GPL/BL DUAL LICENSE BLOCK ***** -include nan.mk +include nan_definitions.mk VERSION := $(shell cat VERSION) @@ -101,19 +101,20 @@ install: package 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)/blenderstatic $(DISTDIR)/blender + @cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0) else - @cp $(OCGDIR)/blenderdynamic$(EXT0) $(DISTDIR)/blender$(EXT0) + @cp $(OCGDIR)/bin/blender$(EXT0) $(DISTDIR)/blender$(EXT0) endif ifneq ($(NOSTRIP),true) @echo "----> Strip blender executable" - @strip $(DISTDIR)/blender + @strip $(DISTDIR)/blender$(EXT0) endif @[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\ echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \ diff --git a/release/VERSION b/release/VERSION index 097cb55913a..af1bb978eb7 100644 --- a/release/VERSION +++ b/release/VERSION @@ -1 +1 @@ -2.21c +2.26a |