Fix the fix for newlines in echo commands. Tickets #311, #282, #256. (CVS 979)

FossilOrigin-Name: baea7aca10e30f30b874e1e8b6cd3b05954ba83c

diff --git a/Makefile.in b/Makefile.in
index 4ea3e6d9fe95dc84c1edf186ba3ca5ed0e49059b..91c9fdf9f507e6a57118b7c1dead2045bff03e36 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -247,10 +247,11 @@ parse.c:  $(TOP)/src/parse.y lemon
 config.h:      
        echo '#include <stdio.h>' >temp.c
        echo 'int main(){printf(' >>temp.c
-       echo '"#define SQLITE_PTR_SZ %d\\n",sizeof(char*));' >>temp.c
+       echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c
        echo 'exit(0);}' >>temp.c
        $(BCC) -o temp temp.c
        ./temp >config.h
+       echo >>config.h
        rm -f temp.c temp
 
 sqlite.h:      $(TOP)/src/sqlite.h.in 

diff --git a/main.mk b/main.mk
index 35f0222eb4f797b840bc1f13eae29cbdf9419470..b70f591fc21b3b637e8bbf371fd00bc74f0ce181 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -215,10 +215,11 @@ parse.c:  $(TOP)/src/parse.y lemon
 config.h:      
        echo '#include <stdio.h>' >temp.c
        echo 'int main(){printf(' >>temp.c
-       echo '"#define SQLITE_PTR_SZ %d\\n",sizeof(char*));' >>temp.c
+       echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c
        echo 'exit(0);}' >>temp.c
        $(BCC) -o temp temp.c
        ./temp >config.h
+       echo >>config.h
        rm -f temp.c temp
 
 sqlite.h:      $(TOP)/src/sqlite.h.in 

diff --git a/manifest b/manifest
index 79306e4784e9de2287f2aa9abf419d6769887f9f..edc671148cb5649a65e9c4377f8e0e4bd5ca0c57 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Bump\sthe\sversion\snumber\sto\s2.8.1.\s\sUpdate\sdocumentation\sprior\sto\srelease.\s(CVS\s978)
-D 2003-05-17T01:39:40
-F Makefile.in 14d22c39109f6212b1fcc15aee6d05b20ac68476
+C Fix\sthe\sfix\sfor\snewlines\sin\secho\scommands.\s\sTickets\s#311,\s#282,\s#256.\s(CVS\s979)
+D 2003-05-17T02:27:21
+F Makefile.in 1ff85c27d4350c74118341024e8a4fb2a04a3a43
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
 F VERSION 861f3b65982ad74cf5a8ddc9ce5df857c4c7a3bf
@@ -14,7 +14,7 @@ F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F libtool bbbea7d79c23323e4100103836028e4fad0d9242
 F ltmain.sh abfb9387049fff6996afc6e325736597795baf11
-F main.mk a22911e6793b9eae920afcffd5b7dd9ba5cdecf2
+F main.mk d01843179ed14559adb75f7e2fe093c943d56756
 F publish.sh 86b5e8535830a2588f62ce1d5d1ef00e1dede23a
 F spec.template 238f7db425a78dc1bb7682e56e3834c7270a3f5e
 F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
@@ -165,7 +165,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl 4bd1729e320f5fa9125f0022b281fbe839192125
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P d614861b8ad9e661b8f08131b95d730e2c2c35c2
-R c76d9b8ab613a0380e0dfbca7054b976
+P 0874814ab01ffc0acffec8e6cec34eaab3428d36
+R d79117ebcf990c76ac030f81c35e1389
 U drh
-Z bb2218ce727ba25eecc329f2efd70f2c
+Z 63739ab587e63f67ac6a2fd296939d48

diff --git a/manifest.uuid b/manifest.uuid
index f4c1116efc047af4d479dbc6f1e63c4eace2c47f..9e742f8cba0d1f73d4dc00b188208c86c513bd6d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0874814ab01ffc0acffec8e6cec34eaab3428d36
\ No newline at end of file
+baea7aca10e30f30b874e1e8b6cd3b05954ba83c
\ No newline at end of file