enabled build with hardcoded ca-bundle path;

added distclean target.

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 726c2c95295a78719882f0f7afc9b2eb619c26c3..a90443bf9ecfec3a2eca25ede27f6abb649062eb 100644 (file)
--- 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 ab43274c7e3f30a009981d9d3e002d8d1e51f67a..42bb639df67206d5212e9908e7a111959db4f183 100644 (file)
--- 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)