diff options
| author | bjarni <bjarni@openttd.org> | 2004-09-09 19:16:27 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2004-09-09 19:16:27 +0000 |
| commit | cbdd0886495f9a7bc6fcd5cfdae1f4ff135e8c95 (patch) | |
| tree | 3c51fd39c300dd587c12436529fe79a27844ebd8 | |
| parent | 216abe4e93bae5c02fb613fe148a8ac6252cf82f (diff) | |
| download | openttd-cbdd0886495f9a7bc6fcd5cfdae1f4ff135e8c95.tar.xz | |
(svn r190) Makefile: fixed bug, that prevented compilation with MANUAL_CONFIG enabled
| -rw-r--r-- | Makefile | 25 |
1 files changed, 17 insertions, 8 deletions
@@ -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 |