forked from bartvdbraak/blender
Tweaked the makefile build system to copy the new freedesktop icons
into an icons folder in the release package on linux, freebsd and openbsd when doing 'make release'.
This commit is contained in:
parent
56b11f6e48
commit
0597e17710
@ -37,6 +37,7 @@ BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)$(TYPE)
|
||||
export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME)
|
||||
export CONFDIR=$(DISTDIR)/.blender
|
||||
|
||||
|
||||
release: all
|
||||
|
||||
all:
|
||||
@ -90,6 +91,18 @@ install: package
|
||||
@cp text/blender.html $(DISTDIR)
|
||||
@cp text/*.txt $(DISTDIR)
|
||||
@cp text/*.pdf $(DISTDIR)
|
||||
ifeq ($(FREEDESKTOP), true)
|
||||
@#echo "****> Install freedesktop icons"
|
||||
@mkdir $(DISTDIR)/icons
|
||||
@mkdir $(DISTDIR)/icons/16x16
|
||||
@cp freedesktop/icons/16x16/blender.png $(DISTDIR)/icons/16x16
|
||||
@mkdir $(DISTDIR)/icons/22x22
|
||||
@cp freedesktop/icons/22x22/blender.png $(DISTDIR)/icons/22x22
|
||||
@mkdir $(DISTDIR)/icons/32x32
|
||||
@cp freedesktop/icons/32x32/blender.png $(DISTDIR)/icons/32x32
|
||||
@mkdir $(DISTDIR)/icons/scalable
|
||||
@cp freedesktop/icons/scalable/blender.svg $(DISTDIR)/icons/scalable
|
||||
endif
|
||||
@echo "----> Make Config dir .blender"
|
||||
@mkdir -p $(CONFDIR)
|
||||
@# possible overruling .txt text documents
|
||||
|
@ -58,6 +58,7 @@ all debug::
|
||||
export LCGDIR = $(NAN_LIBDIR)/$(CONFIG_GUESS)
|
||||
# Object Config_Guess DIRectory
|
||||
export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS)
|
||||
|
||||
export NAN_MOTO ?= $(LCGDIR)/moto
|
||||
ifeq ($(FREE_WINDOWS), true)
|
||||
export NAN_SOLID ?= $(LCGDIR)/gcc/solid
|
||||
@ -103,6 +104,8 @@ endif
|
||||
endif
|
||||
|
||||
export WITH_OPENEXR ?= true
|
||||
|
||||
|
||||
ifeq ($(OS),windows)
|
||||
export NAN_WINTAB ?= $(LCGDIR)/wintab
|
||||
ifeq ($(FREE_WINDOWS), true)
|
||||
@ -250,6 +253,8 @@ endif
|
||||
|
||||
export ID = $(shell whoami)
|
||||
export HOST = $(shell hostname -s)
|
||||
export FREEDESKTOP ?= true
|
||||
|
||||
export NAN_PYTHON ?= /usr/local
|
||||
export NAN_PYTHON_VERSION ?= 2.3
|
||||
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
|
||||
@ -336,6 +341,8 @@ endif
|
||||
|
||||
export ID = $(shell whoami)
|
||||
export HOST = $(shell hostname -s)
|
||||
export FREEDESKTOP ?= true
|
||||
|
||||
export NAN_PYTHON ?= /usr
|
||||
ifeq ($(CPU),ia64)
|
||||
export NAN_PYTHON_VERSION ?= 2.2
|
||||
@ -392,6 +399,8 @@ endif
|
||||
|
||||
export ID = $(shell whoami)
|
||||
export HOST = $(shell hostname -s)
|
||||
export FREEDESKTOP ?= true
|
||||
|
||||
export NAN_PYTHON ?= $(LCGDIR)/python
|
||||
export NAN_PYTHON_VERSION ?= 2.3
|
||||
export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
|
||||
|
Loading…
Reference in New Issue
Block a user