From 0597e177102c93907704c131efc07a763912ae9f Mon Sep 17 00:00:00 2001
From: Matt Ebb <matt@mke3.net>
Date: Tue, 14 Nov 2006 04:29:04 +0000
Subject: [PATCH] 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'.

---
 release/Makefile          | 13 +++++++++++++
 source/nan_definitions.mk |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/release/Makefile b/release/Makefile
index 993eb8faa3c..810d3a31665 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -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
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 4b8873f5972..a75c913ab93 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -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)