From f671d0513ccc9cdcd7516c732c719b2f31a9578e Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Tue, 14 Jul 2009 13:25:14 +0000
Subject: renamed generated config.h to curl_config.h in order to avoid clashes
 when libcurl is used with other projects which also have a config.h.

---
 lib/makefile.dj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/makefile.dj')

diff --git a/lib/makefile.dj b/lib/makefile.dj
index b8d324923..594fff0fb 100644
--- a/lib/makefile.dj
+++ b/lib/makefile.dj
@@ -4,7 +4,7 @@
 #
 # $Id$
 
-DEPEND_PREREQ = config.h
+DEPEND_PREREQ = curl_config.h
 TOPDIR = ..
 
 include ../packages/DOS/common.dj
@@ -17,18 +17,18 @@ CURL_LIB = libcurl.a
 # NOTE: if ../include/curl/curlbuild.h is missing, you're probably building
 # this from a CVS checkout and then you need to run buildconf.bat first.
 
-all: $(OBJ_DIR) config.h $(CURL_LIB)
+all: $(OBJ_DIR) curl_config.h $(CURL_LIB)
 
 $(CURL_LIB): $(OBJECTS)
 	ar rs $@ $?
 
-config.h: config.dos
+curl_config.h: config.dos
 	$(COPY) $^ $@
 
 # clean generated files
 #
 genclean:
-	- $(DELETE) config.h
+	- $(DELETE) curl_config.h
 
 # clean object files and subdir
 #
-- 
cgit v1.2.3