made debug flag settable from outside; add allways debug stuff when DB != NDEBUG

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 51fb08e077ceea422190142861259351488263db..f089d11b8e4e3e36e95d69ccc9b1df14c209399d 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -25,7 +25,7 @@ endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.14
+LIBSSH2_PATH = ../../libssh2-0.15
 endif
 
 ifndef INSTDIR
@@ -47,10 +47,10 @@ ifndef LIBARCH
 LIBARCH = LIBC
 endif
 
-# must be equal to DEBUG or NDEBUG
+# must be equal to NDEBUG or DEBUG, CURLDEBUG
+ifndef DB
 DB     = NDEBUG
-# DB   = DEBUG
-# DB   = CURLDEBUG
+endif
 # Optimization: -O<n> or debugging: -g
 ifeq ($(DB),NDEBUG)
        OPT     = -O2
@@ -274,7 +274,7 @@ ifdef SCREEN
 else
        @echo $(DL)screenname "DEFAULT"$(DL) >> $@
 endif
-ifeq ($(DB),DEBUG)
+ifneq ($(DB),NDEBUG)
        @echo $(DL)debug$(DL) >> $@
 endif
        @echo $(DL)threadname "$(TARGET)"$(DL) >> $@

diff --git a/src/Makefile.netware b/src/Makefile.netware
index f391413978ae5d2e497aea68584c3bf2dba4f970..d625013abaf0c40d8c6a14a768ccfd3224cb55c4 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -25,7 +25,7 @@ endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.14
+LIBSSH2_PATH = ../../libssh2-0.15
 endif
 
 ifndef INSTDIR
@@ -48,9 +48,10 @@ ifndef LIBARCH
 LIBARCH = LIBC
 endif
 
-# must be equal to DEBUG or NDEBUG
+# must be equal to NDEBUG or DEBUG, CURLDEBUG
+ifndef DB
 DB     = NDEBUG
-# DB   = DEBUG
+endif
 # Optimization: -O<n> or debugging: -g
 ifeq ($(DB),NDEBUG)
        OPT     = -O2
@@ -252,7 +253,7 @@ ifdef SCREEN
 else
        @echo $(DL)screenname "DEFAULT"$(DL) >> $@
 endif
-ifeq ($(DB),DEBUG)
+ifneq ($(DB),NDEBUG)
        @echo $(DL)debug$(DL) >> $@
 endif
        @echo $(DL)threadname "$(TARGET)"$(DL) >> $@