diff options
| author | Matt Ebb <matt@mke3.net> | 2006-11-14 07:29:04 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2006-11-14 07:29:04 +0300 |
| commit | 0597e177102c93907704c131efc07a763912ae9f (patch) | |
| tree | 4188e50219448ec4b4b04fe2d8651e5f42433d4e /source/nan_definitions.mk | |
| parent | 56b11f6e48de76833c390a0d4690fdca9bebdf81 (diff) | |
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'.
Diffstat (limited to 'source/nan_definitions.mk')
| -rw-r--r-- | source/nan_definitions.mk | 9 |
1 files changed, 9 insertions, 0 deletions
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) |