# HG changeset patch
# User bjarni
# Date 1094757387 0
# Node ID 4d133909845a17b9610c90bd5a2ad996d0f7c15c
# Parent  30f27b5c1ee56c5606cc0717abdae0b8f9eae21d
(svn r190) Makefile: fixed bug, that prevented compilation with MANUAL_CONFIG enabled

diff -r 30f27b5c1ee5 -r 4d133909845a Makefile
--- 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