From: Gunter Knauf <gk@gknw.de>
Date: Sun, 28 Jan 2007 15:31:06 +0000 (+0000)
Subject: enabled build with hardcoded ca-bundle path;
X-Git-Tag: curl-7_16_1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee51c07be607c9592c1fac3210604924603c46a3;p=thirdparty%2Fcurl.git

enabled build with hardcoded ca-bundle path;
added distclean target.
---

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 726c2c9529..a90443bf9e 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -220,6 +220,9 @@ clean:
 	-$(RM) config.h ca-bundle.h
 	-$(RM) -r $(OBJDIR)
 
+distclean: clean
+	-$(RM) -r $(TARGET).lib $(TARGET).nlm
+
 $(INSTDIR):
 	@mkdir $(INSTDIR)
 
@@ -434,12 +437,19 @@ ca-bundle.h: FORCE Makefile.netware
 	@echo $(DL)/* Do not edit this file - it is created by make!$(DL) > $@
 	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
 	@echo $(DL)*/$(DL) >> $@
+ifdef CABUNDLE
+	@echo $(DL)#define CURL_CA_BUNDLE "$(CABUNDLE)"$(DL) >> $@
+else
 	@echo $(DL)#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")$(DL) >> $@
+endif
 
 info: $(OBJDIR)/version.inc
 	@echo Configured to build $(TARGET) with these options:
 	@echo curl version:    $(LIBCURL_VERSION_STR)
 	@echo compiler/linker: $(CC) / $(LD)
+ifdef CABUNDLE
+	@echo ca-bundle path:  $(CABUNDLE)
+endif
 ifdef WITH_SSL
 	@echo SSL support:     enabled (OpenSSL)
 else
diff --git a/src/Makefile.netware b/src/Makefile.netware
index ab43274c7e..42bb639df6 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -198,6 +198,9 @@ endif
 	-$(RM) config.h
 	-$(RM) -r $(OBJDIR)
 
+distclean: clean
+	-$(RM) -r $(TARGET).nlm
+
 $(INSTDIR):
 	@mkdir $(INSTDIR)