(svn r190) Makefile: fixed bug, that prevented compilation with MANUAL_CONFIG enabled
--- a/Makefile Thu Sep 09 16:20:33 2004 +0000
+++ b/Makefile Thu Sep 09 19:16:27 2004 +0000
@@ -105,15 +105,24 @@
# updates makefile.config if it's outdated
ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
-UPDATECONFIG:=upgradeconf
-CONFIG_INCLUDED:=
+ 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
-# this should define SDL-CONFIG for manual configuration
-ifeq ($(shell uname),FreeBSD)
-SDL-CONFIG:=sdl11-config
-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