* Use better option propagation everywhere

  lukep, I didn't touch darwin-config.py yet, because you're still
  working on it. But if you could see and make similar changes as
  I did to the rest.

3 files changed, 63 insertions, 63 deletions

diff --git a/config/linux2-config.py b/config/linux2-config.py
index 9763573e7ad..ec4b283c4d3 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -1,8 +1,8 @@
 LCGDIR = '../lib/linux2'
 BF_PYTHON = '/usr'
 BF_PYTHON_VERSION = '2.4'
-BF_PYTHON_INC = BF_PYTHON + '/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = BF_PYTHON+'/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
 
 WITH_BF_OPENAL = 'true'
@@ -40,7 +40,7 @@ BF_TIFF_LIB = 'tiff'
 
 WITH_BF_ZLIB = 'true'
 BF_ZLIB = '/usr'
-BF_ZLIB_INC = BF_ZLIB + '/include'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'z'
 
 WITH_BF_GETTEXT = 'true'
@@ -67,7 +67,7 @@ BF_BULLET_INC = '${BF_BULLET}/LinearMath ${BF_BULLET}/BulletDynamics ${BF_BULLET
 BF_BULLET_LIB = 'extern_bullet'
 
 BF_SOLID = '#extern/solid'
-BF_SOLID_INC = BF_SOLID
+BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 78294824a1d..db81d418ec3 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -1,65 +1,65 @@
 LCGDIR = '#../lib/windows'
 BF_PYTHON = LCGDIR + '/python'
 BF_PYTHON_VERSION = '2.4'
-BF_PYTHON_INC = BF_PYTHON + '/include/python' + BF_PYTHON_VERSION
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
 BF_PYTHON_LIB = 'python24'
-BF_PYTHON_LIBPATH = BF_PYTHON + '/lib'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = 'true'
 BF_OPENAL = LCGDIR + '/openal'
-BF_OPENAL_INC = BF_OPENAL+'/include'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIBPATH = BF_OPENAL + '/lib'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_SDL = 'true'
 BF_SDL = '#../extra/SDL-1.2.9' #$(shell sdl-config --prefix)
-BF_SDL_INC = BF_SDL + '/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDLmain SDL' #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-BF_SDL_LIBPATH = BF_SDL + '/lib'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 WITH_BF_FMOD = 'false'
 BF_FMOD = LCGDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = LCGDIR + '/gcc/openexr'
-BF_OPENEXR_INC = BF_OPENEXR + '/include ' + BF_OPENEXR + '/include/OpenEXR'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath '
 BF_OPENEXR_LIBPATH = LCGDIR+'/openexr/lib'
 
 WITH_BF_JPEG = 'true'
 BF_JPEG = LCGDIR + '/jpeg'
-BF_JPEG_INC = BF_JPEG + '/include'
+BF_JPEG_INC = '${BF_JPEG}/include'
 BF_JPEG_LIB = 'jpeg'
-BF_JPEG_LIBPATH = BF_JPEG + '/lib'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
 WITH_BF_PNG = 'true'
 BF_PNG = LCGDIR + '/png'
-BF_PNG_INC = BF_PNG + '/include'
+BF_PNG_INC = '${BF_PNG}/include'
 BF_PNG_LIB = 'png'
-BF_PNG_LIBPATH = BF_PNG + '/lib'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
 
 WITH_BF_TIFF = 'true'
 BF_TIFF = LCGDIR + '/tiff'
-BF_TIFF_INC = BF_TIFF + '/include'
+BF_TIFF_INC = '${BF_TIFF}/include'
 BF_TIFF_LIB = 'z tiff'
-BF_TIFF_LIBPATH = BF_TIFF + '/lib'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
 
 WITH_BF_ZLIB = 'true'
 BF_ZLIB = LCGDIR + '/zlib'
-BF_ZLIB_INC = BF_ZLIB + '/include'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'z'
-BF_ZLIB_LIBPATH = BF_ZLIB + '/lib'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_GETTEXT = 'true'
 BF_GETTEXT = LCGDIR + '/gettext'
-BF_GETTEXT_INC = BF_GETTEXT + '/include'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'freegettext'
 BF_GETTEXT_LIBPATH = '#../extra/gettext'
 
 WITH_BF_FTGL = 'true'
 BF_FTGL = LCGDIR + '/ftgl'
-BF_FTGL_INC = BF_FTGL + '/include'
+BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE = 'false'
@@ -71,11 +71,11 @@ BF_ODE_LIB = BF_ODE + '/lib/libode.a'
 
 WITH_BF_BULLET = 'true'
 BF_BULLET = '#extern/bullet'
-BF_BULLET_INC = BF_BULLET + '/LinearMath ' + BF_BULLET + '/BulletDynamics ' + BF_BULLET + '/Bullet'
+BF_BULLET_INC = '${BF_BULLET}/LinearMath ${BF_BULLET}/BulletDynamics ${BF_BULLET}/Bullet'
 BF_BULLET_LIB = 'extern_bullet'
 
 BF_SOLID = '#extern/solid'
-BF_SOLID_INC = BF_SOLID
+BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
@@ -98,23 +98,23 @@ BF_SOLID_LIB = 'extern_solid'
 # enable freetype2 support for text objects
 WITH_BF_FREETYPE = 'true'
 BF_FREETYPE = '#../extra/freetype'
-BF_FREETYPE_INC = BF_FREETYPE + '/include '
+BF_FREETYPE_INC = '${BF_FREETYPE}/include '
 BF_FREETYPE_LIB = 'freetype'
-BF_FREETYPE_LIBPATH = BF_FREETYPE + '/lib'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
 
 WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
 BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = BF_QUICKTIME + '/include'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 
 # Mesa Libs should go here if your using them as well....
 WITH_BF_OPENGL = 'true'
 BF_OPENGL = 'C:\\MingW'
-BF_OPENGL_INC = BF_OPENGL + '/include'
-BF_OPENGL_LIBINC = BF_OPENGL + '/lib'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
 BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ BF_OPENGL + '/lib/libGL.a', BF_OPENGL + '/lib/libGLU.a',
-             BF_OPENGL + '/lib/libXmu.a', BF_OPENGL + '/lib/libXext.a',
-             BF_OPENGL + '/lib/libX11.a', BF_OPENGL + '/lib/libXi.a' ]
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
+             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
 ##
 ##CC = gcc
 ##CCC = g++
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 6c48641136d..b07cfcfa5ae 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -1,71 +1,71 @@
 LCGDIR = '#../lib/windows'
 BF_PYTHON = LCGDIR + '/python'
 BF_PYTHON_VERSION = '2.4'
-BF_PYTHON_INC = BF_PYTHON + '/include/python' + BF_PYTHON_VERSION
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
 BF_PYTHON_LIB = 'python24'
-BF_PYTHON_LIBPATH = BF_PYTHON + '/lib'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = 'true'
 BF_OPENAL = LCGDIR + '/openal'
-BF_OPENAL_INC = BF_OPENAL+'/include ' + BF_OPENAL+'/include/AL '
+BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
 BF_OPENAL_LIB = 'openal_static'
-BF_OPENAL_LIBPATH = BF_OPENAL + '/lib'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_ICONV = 'true'
 BF_ICONV = LCGDIR + '/iconv'
-BF_ICONV_INC = BF_ICONV + '/include'
+BF_ICONV_INC = '${BF_ICONV}/include'
 BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = BF_ICONV + '/lib'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
 WITH_BF_SDL = 'true'
 BF_SDL = LCGDIR + '/sdl' #$(shell sdl-config --prefix)
-BF_SDL_INC = BF_SDL + '/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL.lib' #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-BF_SDL_LIBPATH = BF_SDL + '/lib'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 WITH_BF_FMOD = 'false'
 BF_FMOD = LCGDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = LCGDIR + '/openexr'
-BF_OPENEXR_INC = BF_OPENEXR + '/include ' + BF_OPENEXR + '/include/IlmImf ' + BF_OPENEXR + '/include/Iex ' + BF_OPENEXR + '/include/Imath '
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath '
-BF_OPENEXR_LIBPATH = BF_OPENEXR+'/lib'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
 WITH_BF_JPEG = 'true'
 BF_JPEG = LCGDIR + '/jpeg'
-BF_JPEG_INC = BF_JPEG + '/include'
+BF_JPEG_INC = '${BF_JPEG}/include'
 BF_JPEG_LIB = 'libjpeg'
-BF_JPEG_LIBPATH = BF_JPEG + '/lib'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
 WITH_BF_PNG = 'true'
 BF_PNG = LCGDIR + '/png'
-BF_PNG_INC = BF_PNG + '/include'
+BF_PNG_INC = '${BF_PNG}/include'
 BF_PNG_LIB = 'libpng'
-BF_PNG_LIBPATH = BF_PNG + '/lib'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
 
 WITH_BF_TIFF = 'true'
 BF_TIFF = LCGDIR + '/tiff'
-BF_TIFF_INC = BF_TIFF + '/include'
+BF_TIFF_INC = '${BF_TIFF}/include'
 BF_TIFF_LIB = 'libtiff'
-BF_TIFF_LIBPATH = BF_TIFF + '/lib'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
 
 WITH_BF_ZLIB = 'true'
 BF_ZLIB = LCGDIR + '/zlib'
-BF_ZLIB_INC = BF_ZLIB + '/include'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'libz'
-BF_ZLIB_LIBPATH = BF_ZLIB + '/lib'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_GETTEXT = 'true'
 BF_GETTEXT = LCGDIR + '/gettext'
-BF_GETTEXT_INC = BF_GETTEXT + '/include'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gnu_gettext'
-BF_GETTEXT_LIBPATH = BF_GETTEXT + '/lib'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_FTGL = 'true'
 BF_FTGL = LCGDIR + '/ftgl'
-BF_FTGL_INC = BF_FTGL + '/include'
+BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE = 'true'
@@ -77,11 +77,11 @@ BF_ODE_LIB = BF_ODE + '/lib/libode.a'
 
 WITH_BF_BULLET = 'true'
 BF_BULLET = '#extern/bullet'
-BF_BULLET_INC = BF_BULLET + '/LinearMath ' + BF_BULLET + '/BulletDynamics ' + BF_BULLET + '/Bullet'
+BF_BULLET_INC = '${BF_BULLET}/LinearMath ${BF_BULLET}/BulletDynamics ${BF_BULLET}/Bullet'
 BF_BULLET_LIB = 'extern_bullet'
 
 BF_SOLID = '#extern/solid'
-BF_SOLID_INC = BF_SOLID
+BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
@@ -104,25 +104,25 @@ BF_SOLID_LIB = 'extern_solid'
 # enable freetype2 support for text objects
 WITH_BF_FREETYPE = 'true'
 BF_FREETYPE = LCGDIR + '/freetype'
-BF_FREETYPE_INC = BF_FREETYPE + '/include ' + BF_FREETYPE + '/include/freetype2'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype2ST'
-BF_FREETYPE_LIBPATH = BF_FREETYPE + '/lib'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
 
 WITH_BF_QUICKTIME = 'true' # -DWITH_QUICKTIME
 BF_QUICKTIME = LCGDIR + '/QTDevWin'
-BF_QUICKTIME_INC = BF_QUICKTIME + '/CIncludes'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
 BF_QUICKTIME_LIB = 'qtmlClient'
-BF_QUICKTIME_LIBPATH = BF_QUICKTIME + '/Libraries'
+BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
 
 # Mesa Libs should go here if your using them as well....
 WITH_BF_OPENGL = 'true'
 #BF_OPENGL = 'C:\\MingW'
-BF_OPENGL_INC = BF_OPENGL + '/include'
-BF_OPENGL_LIBINC = BF_OPENGL + '/lib'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
 BF_OPENGL_LIB = 'opengl32 glu32'
-BF_OPENGL_LIB_STATIC = [ BF_OPENGL + '/lib/libGL.a', BF_OPENGL + '/lib/libGLU.a',
-             BF_OPENGL + '/lib/libXmu.a', BF_OPENGL + '/lib/libXext.a',
-             BF_OPENGL + '/lib/libX11.a', BF_OPENGL + '/lib/libXi.a' ]
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
+             '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+             '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
 ##
 ##CC = gcc
 ##CCC = g++