Changeset - r189:ac3ab29a08af
[Not reviewed]
master
0 1 0
bjarni - 20 years ago 2004-09-09 19:16:27
bjarni@openttd.org
(svn r190) Makefile: fixed bug, that prevented compilation with MANUAL_CONFIG enabled
1 file changed with 17 insertions and 8 deletions:
Makefile
17
8
0 comments (0 inline, 0 general)
Makefile
Show inline comments
 
@@ -105,15 +105,24 @@ endif
 

	
 
# 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
0 comments (0 inline, 0 general)