Moved sinclude for user-def.mk

2005-04-30 21:06:54 +00:00
parent e46c8b8ad6
commit 413677caff
2 changed files with 2 additions and 1 deletions
--- a/source/Makefile
+++ b/source/Makefile
@@ -36,7 +36,6 @@ ifndef NANENV
    export NANENV := $(shell env | grep NAN_)
 endif

-sinclude ../user-def.mk
 include nan_definitions.mk

 DIRS = creator blender kernel
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -32,6 +32,8 @@
 # set some defaults when these are not overruled (?=) by environment variables
 #

+sinclude ../user-def.mk
+
 ifndef CONFIG_GUESS
  ifeq (debug, $(findstring debug, $(MAKECMDGOALS)))
    ifeq (all, $(findstring all, $(MAKECMDGOALS)))