aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunter Knauf <gk@gknw.de>2007-01-28 15:31:06 +0000
committerGunter Knauf <gk@gknw.de>2007-01-28 15:31:06 +0000
commitee51c07be607c9592c1fac3210604924603c46a3 (patch)
tree4a5b2f29ece46ebefbe5ccbd25f15793aa190beb
parent856ba4c6c6b38622b455a0762a45c56f9515afd4 (diff)
enabled build with hardcoded ca-bundle path;
added distclean target.
-rw-r--r--lib/Makefile.netware10
-rw-r--r--src/Makefile.netware3
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 726c2c952..a90443bf9 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 ab43274c7..42bb639df 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)