From 45a0557b37cdf8e25655df59845198825a8fbb8d Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Fri, 31 Mar 2006 21:06:55 +0000
Subject: (svn r4217) Replace SDL-CONFIG and LIBPNG-CONFIG with SDL_CONFIG and
 LIBPNG_CONFIG

---
 makefiledir/Makefile.config_writer |  4 ++--
 makefiledir/Makefile.libdetection  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'makefiledir')

diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer
index a305c89d0..7caff27d7 100644
--- a/makefiledir/Makefile.config_writer
+++ b/makefiledir/Makefile.config_writer
@@ -92,8 +92,8 @@ $(MAKE_CONFIG):
 	$(call CONFIG_LINE,)
 
 	$(call CONFIG_LINE,\# misc)
-	$(call CONFIG_LINE,SDL-CONFIG:=$(SDL-CONFIG))
-	$(call CONFIG_LINE,LIBPNG-CONFIG:=$(LIBPNG-CONFIG))
+	$(call CONFIG_LINE,SDL_CONFIG:=$(SDL_CONFIG))
+	$(call CONFIG_LINE,LIBPNG_CONFIG:=$(LIBPNG_CONFIG))
 	$(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER))
 	$(call CONFIG_LINE,CONFIG_INCLUDED:=yes)
 	$(call CONFIG_LINE,PATH_SET:=$(PATH_SET))
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection
index ade09c076..7139fd5cf 100644
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@@ -63,22 +63,22 @@ endif
 
 # FreeBSD uses sdl11 instead of sdl
 ifdef FREEBSD
-SDL-CONFIG:=sdl11-config
+SDL_CONFIG:=sdl11-config
 else
-SDL-CONFIG:=sdl-config
+SDL_CONFIG:=sdl-config
 endif
 
 # set libpng-config to the default value
-LIBPNG-CONFIG :=libpng-config
+LIBPNG_CONFIG :=libpng-config
 
 # Networking, enabled by default
 WITH_NETWORK:=1
 
 # Library detections
-WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
+WITH_SDL:=$(shell $(SDL_CONFIG) --version 2>/dev/null)
 
 # libpng detection
-WITH_PNG:=$(shell $(LIBPNG-CONFIG) --version 2>/dev/null)
+WITH_PNG:=$(shell $(LIBPNG_CONFIG) --version 2>/dev/null)
 
 ifdef WITH_PNG
 	# LibPNG depends on Zlib
-- 
cgit v1.2.3-54-g00ecf