diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ba265cb66a..d5c80525c4 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,14 @@
+2001-02-20 23:10 UTC-0800 Ron Pinkas <ron@profit-master.com>
+   * make_gnu.bat
+     ! Fixed maker to make -r
+     * Added %HARBOURDIR% and removed trailing slash from HB_BIN_INSTALL, HB_LIB_INSTALL and HB_INC_INSTALL
+
+   * contrib/dot/pp.prg
+     * Minor corrections to stringifys
+
+   * utils/hbtest/hbtest.prg
+     * Commented out RddSetDefault( "DBFCDX" )
+
 2001-02-20 13:10 GMT+3 Alexander Kresin <alex@belacy.belgorod.su>
    * harbour/include/hbver.h
      * Changed release info to 0.36, etc.
diff --git a/harbour/contrib/dot/pp.prg b/harbour/contrib/dot/pp.prg
index 9f0ad50437..0acdcc2f67 100644
--- a/harbour/contrib/dot/pp.prg
+++ b/harbour/contrib/dot/pp.prg
@@ -1966,7 +1966,7 @@ FUNCTION NextToken( sLine, bCheckRules )
      nClose := AT( ']]', sLine )
      IF nClose == 0
         Alert( "ERROR! [NextToken()] Unterminated '[[' at: " + sLine )
-        RETURN NIL
+        sReturn := "[["
      ELSE
         sReturn := Left( sLine, nClose + 1 )
      ENDIF
@@ -1976,7 +1976,7 @@ FUNCTION NextToken( sLine, bCheckRules )
      nClose := AT( '"', SubStr( sLine, 2 ) )
      IF nClose == 0
         Alert( 'ERROR! [NextToken()] Unterminated ["] at: ' + sLine )
-        RETURN NIL
+        sReturn := '"'
      ELSE
         sReturn := Left( sLine, nClose + 1 )
      ENDIF
@@ -1986,7 +1986,7 @@ FUNCTION NextToken( sLine, bCheckRules )
      nClose := AT( "'", SubStr( sLine, 2 ) )
      IF nClose == 0
         Alert( "ERROR! [NextToken()] Unterminated ['] at: " + sLine )
-        RETURN NIL
+        sReturn := "'"
      ELSE
         sReturn := SubStr( sLine, 2, nClose - 1 )
 
@@ -2008,7 +2008,7 @@ FUNCTION NextToken( sLine, bCheckRules )
         nClose := AT( ']', sLine )
         IF nClose == 0
            Alert( "ERROR! [NextToken()] Unterminated ']' at: " + sLine )
-           RETURN NIL
+           sReturn := '['
         ELSE
            sReturn := SubStr( sLine, 2, nClose - 2 )
 
@@ -2637,7 +2637,7 @@ RETURN IIF( cType == 'A', aExp, sExp )
 FUNCTION PPOut( aResults, aMarkers )
 
   LOCAL Counter, nResults, sResult := "", nMarker, nMatches, nMatch//, aMarkers := aResults[3]
-  LOCAL xValue, nRepeats := 0, nDependee, nGroupStart
+  LOCAL xValue, nRepeats := 0, nDependee, nGroupStart, sDumb
 
   IF aResults[1] == NIL
      nResults := 0
@@ -2777,21 +2777,33 @@ FUNCTION PPOut( aResults, aMarkers )
         /* #<x> Dumb Stringify */
         CASE aResults[2][Counter] == 2
            IF ValType( xValue ) == 'A'
-              sResult += '"'
+              sDumb := ""
               nMatches := Len( xValue )
               FOR nMatch := 1 TO nMatches
-                 sResult += xValue[nMatch]
+                 sDumb += xValue[nMatch]
                  IF nMatch < nMatches
-                    sResult += ', '
+                    sDumb += ", "
                  ENDIF
               NEXT
-              sResult += '"'
+              IF '"' $ sDumb .AND. ['] $ sDumb .AND. ']' $ sDumb .AND. Left( sDumb, 1 ) != '['
+                 sResult += '[[' + sDumb + ']]'
+              ELSEIF '"' $ sDumb .AND. ['] $ sDumb
+                 sResult += '[' + sDumb + ']'
+              ELSEIF '"' $ sDumb
+                 sResult += ['] + sDumb + [']
+              ELSE
+                 sResult += '"' + sDumb + '"'
+              ENDIF
            ELSE
               IF xValue == NIL
                  sResult += '""'
               ELSE
-                 IF Left( xValue, 1 ) $ '"['
+                 IF '"' $ xValue .AND. ['] $ xValue .AND. ']' $ xValue .AND. Left( xValue, 1 ) != '['
+                    sResult += "[[" + xValue + "]]"
+                 ELSEIF '"' $ xValue .AND. ['] $ xValue
                     sResult += '[' + xValue + ']'
+                 ELSEIF '"' $ xValue
+                    sResult += ['] + xValue + [']
                  ELSE
                     sResult += '"' + xValue + '"'
                  ENDIF
@@ -2803,10 +2815,14 @@ FUNCTION PPOut( aResults, aMarkers )
            IF ValType( xValue ) == 'A'
               nMatches := Len( xValue )
               FOR nMatch := 1 TO nMatches
-                 IF Left( xValue[nMatch], 1 ) $ '"['
-                    sResult += '[' + RTrim( xValue[nMatch] ) + ']'
-                 ELSEIF Left( xValue[nMatch], 1 ) == '&'
+                 IF Left( xValue[nMatch], 1 ) == '&'
                     sResult += RTrim( SubStr( xValue[nMatch], 2 ) )
+                 ELSEIF '"' $ xValue[nMatch] .AND. ['] $ xValue[nMatch] .AND. ']' $ xValue[nMatch] .AND. Left( xValue[nMatch], 1 ) != '['
+                    sResult += "[[" + RTrim( xValue[nMatch] ) + "]]"
+                 ELSEIF '"' $ xValue[nMatch] .AND. ['] $ xValue[nMatch]
+                    sResult += '[' + RTrim( xValue[nMatch] ) + ']'
+                 ELSEIF '"' $ xValue[nMatch]
+                    sResult += ['] + RTrim( xValue[nMatch] ) + [']
                  ELSE
                     sResult += '"' + RTrim( xValue[nMatch] ) + '"'
                  ENDIF
@@ -2817,12 +2833,16 @@ FUNCTION PPOut( aResults, aMarkers )
               NEXT
            ELSE
               IF ! ( xValue == NIL )
-                 IF Left( xValue, 1 ) $ '"['
-                    sResult += '[' + RTrim( xValue ) + ']'
-                 ELSEIF Left( xValue, 1 ) == '&'
+                 IF Left( xValue, 1 ) == '&'
                     sResult += RTrim( SubStr( xValue, 2 ) )
+                 ELSEIF '"' $ xValue .AND. ['] $ xValue .AND. ']' $ xValue .AND. Left( xValue, 1 ) != '['
+                    sResult += "[[" + xValue + "]]"
+                 ELSEIF '"' $ xValue .AND. ['] $ xValue
+                    sResult += '[' + xValue + ']'
+                 ELSEIF '"' $ xValue
+                    sResult += ['] + xValue + [']
                  ELSE
-                    sResult += '"' + RTrim( xValue ) + '"'
+                    sResult += '"' + xValue + '"'
                  ENDIF
               ENDIF
            ENDIF
@@ -2832,12 +2852,10 @@ FUNCTION PPOut( aResults, aMarkers )
            IF ValType( xValue ) == 'A'
               nMatches := Len( xValue )
               FOR nMatch := 1 TO nMatches
-                 IF Left( xValue[nMatch], 1 ) == '('
+                 IF Left( xValue[nMatch], 1 ) $ "('[" + '"'
                     sResult += xValue[nMatch]
                  ELSE
-                    IF Left( xValue[nMatch], 1 ) $ '"['
-                       sResult += '[' + RTrim( xValue[nMatch] ) + ']'
-                    ELSEIF Left( xValue[nMatch], 1 ) == '&'
+                    IF Left( xValue[nMatch], 1 ) == '&'
                        sResult += RTrim( SubStr( xValue[nMatch], 2 ) )
                     ELSE
                        sResult += '"' + RTrim( xValue[nMatch] ) + '"'
@@ -2850,12 +2868,10 @@ FUNCTION PPOut( aResults, aMarkers )
               NEXT
            ELSE
               IF xValue != NIL
-                 IF Left( xValue, 1 ) == '('
+                 IF Left( xValue, 1 ) $ "('[" + '"'
                     sResult += xValue
                  ELSE
-                    IF Left( xValue, 1 ) $ '"['
-                       sResult += '[' + RTrim( xValue ) + ']'
-                    ELSEIF Left( xValue, 1 ) == '&'
+                    IF Left( xValue, 1 ) == '&'
                        sResult += RTrim( SubStr( xValue, 2 ) )
                     ELSE
                        sResult += '"' + RTrim( xValue ) + '"'
diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat
index 634cec09e8..0f28c719a5 100644
--- a/harbour/make_gnu.bat
+++ b/harbour/make_gnu.bat
@@ -24,9 +24,9 @@ rem set L_USR=
 
 rem Set to constant value to be consistent with the non-GNU make files.
 
-if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=bin\
-if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=lib\
-if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=include\
+if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HARBOURDIR%/bin
+if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HARBOURDIR%/lib
+if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HARBOURDIR%/include
 
 :START
 
@@ -109,7 +109,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=include\
    rem ---------------------------------------------------------------
    rem Start the GNU make system
 
-   maker %1 %2 %3 %4 %5 %6 %7 %8 %9
+   make -r %1 %2 %3 %4 %5 %6 %7 %8 %9 > make_gnu.log
    goto END
 
 :END
diff --git a/harbour/utils/hbtest/hbtest.prg b/harbour/utils/hbtest/hbtest.prg
index 3a58e7e3c0..124886c90c 100644
--- a/harbour/utils/hbtest/hbtest.prg
+++ b/harbour/utils/hbtest/hbtest.prg
@@ -265,7 +265,7 @@ STATIC FUNCTION TEST_BEGIN( cParam )
    PUBLIC maArray   := { 9898 }
 
 #ifndef __XPP__
-   rddSetDefault( "DBFCDX" )
+   //rddSetDefault( "DBFCDX" )
 #endif
 
    dbCreate( "!TEMP!.DBF",;