From be15d8ec2e48fc72366f98810eefc6e551f6ec2e Mon Sep 17 00:00:00 2001
From: truelight <truelight@openttd.org>
Date: Tue, 14 Mar 2006 19:10:33 +0000
Subject: [PATCH] (svn r3864) -Fix: small problems with make-system, making
 room for a wrapper-configure

---
 Makefile                          | 2 +-
 makefiledir/Makefile.libdetection | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 59079a8b47..9646660bb1 100644
--- a/Makefile
+++ b/Makefile
@@ -974,7 +974,7 @@ depend:
 	@true # The include handles this automagically
 
 # Introduce the dependencies
-ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper),)
+ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper upgradeconf $(MAKE_CONFIG)),)
 -include $(DEPS)
 endif
 
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection
index 93ae9172fd..213c62b76a 100644
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@@ -6,6 +6,8 @@ endif
 
 ifeq ($(shell expr $(CONFIG_VERSION) \< 9), 1)
 
+ifndef BYPASS_OS_DETECT
+
 # Automatically recognize if building on Win32
 ifdef WINDIR
 ifndef UNIX
@@ -56,6 +58,9 @@ SUNOS:=1
 UNIX:=1
 endif
 
+# END BYPASS_OS_DETECT
+endif
+
 # FreeBSD uses sdl11 instead of sdl
 ifdef FREEBSD
 SDL-CONFIG:=sdl11-config