diff options
| author | Hans Lambermont <hans@lambermont.dyndns.org> | 2003-02-11 15:35:18 +0300 |
|---|---|---|
| committer | Hans Lambermont <hans@lambermont.dyndns.org> | 2003-02-11 15:35:18 +0300 |
| commit | bf2e5762dc46a7d11d617a7574dc7aa376ce571a (patch) | |
| tree | 32d85c3c9c569cd1f974aafbf74bc7f5849005ca /release/Makefile | |
| parent | 8efc08db910e00100bea8ad9da8666cd2e96b8ae (diff) | |
- glue top level makefile and release one together
- fix 8 spaces problem in release/Makefile
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
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)/" && \ |