summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2004-09-09 19:16:27 +0000
committerbjarni <bjarni@openttd.org>2004-09-09 19:16:27 +0000
commitcbdd0886495f9a7bc6fcd5cfdae1f4ff135e8c95 (patch)
tree3c51fd39c300dd587c12436529fe79a27844ebd8
parent216abe4e93bae5c02fb613fe148a8ac6252cf82f (diff)
downloadopenttd-cbdd0886495f9a7bc6fcd5cfdae1f4ff135e8c95.tar.xz
(svn r190) Makefile: fixed bug, that prevented compilation with MANUAL_CONFIG enabled
-rw-r--r--Makefile25
1 files changed, 17 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index bb2e71a5e..1f1764953 100644
--- a/Makefile
+++ b/Makefile
@@ -105,15 +105,24 @@ endif
# updates makefile.config if it's outdated
ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
-UPDATECONFIG:=upgradeconf
-CONFIG_INCLUDED:=
-else
-# this should define SDL-CONFIG for manual configuration
-ifeq ($(shell uname),FreeBSD)
-SDL-CONFIG:=sdl11-config
+ ifndef MANUAL_CONFIG # manual config should not check this
+ UPDATECONFIG:=upgradeconf
+ CONFIG_INCLUDED:=
+ else
+ # this should define SDL-CONFIG for manual configuration
+ ifeq ($(shell uname),FreeBSD)
+ SDL-CONFIG:=sdl11-config
+ else
+ SDL-CONFIG:=sdl-config
+ endif
+ endif
else
-SDL-CONFIG:=sdl-config
-endif
+ # this should define SDL-CONFIG for manual configuration
+ ifeq ($(shell uname),FreeBSD)
+ SDL-CONFIG:=sdl11-config
+ else
+ SDL-CONFIG:=sdl-config
+ endif
endif
ifndef CONFIG_INCLUDED