From cbdd0886495f9a7bc6fcd5cfdae1f4ff135e8c95 Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Thu, 9 Sep 2004 19:16:27 +0000
Subject: (svn r190) Makefile: fixed bug, that prevented compilation with
 MANUAL_CONFIG enabled

---
 Makefile | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3-54-g00ecf