From 3fcd95c1c949555fc6173903edf6e04c6e96fa34 Mon Sep 17 00:00:00 2001
From: crc <crc@noemail.net>
Date: Tue, 26 Feb 2019 13:47:41 +0000
Subject: [PATCH] fix Makefile (forgot to update after the "packages ->
 package" rename)

FossilOrigin-Name: 636cc237b6d5cdd633fa9c33e9f162ee8282168574ce7fc7446c8c19d6ccfe45
---
 Makefile               |  3 +--
 interfaces/rre_image.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index a77fbb6..6903092 100644
--- a/Makefile
+++ b/Makefile
@@ -130,10 +130,9 @@ bin/retro: io bin/retro-embedimage bin/retro-extend interfaces/image.c interface
 	./bin/retro-extend rre.image interfaces/io/io_filesystem.forth interfaces/io/io_gopher.forth interfaces/io/io_floatingpoint.forth interfaces/io/io_unix_syscalls.forth interfaces/io/rng.forth interfaces/rre.forth
 	./bin/retro-embedimage rre.image >interfaces/rre_image.c
 	cd interfaces && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/retro $(LIBM) rre.c image-functions.o $(RREIO)
-	cd packages && ../bin/retro -f list
+	cd package && ../bin/retro -f list
 	./bin/retro-embedimage rre.image >interfaces/rre_image.c
 	cd interfaces && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/retro $(LIBM) rre.c image-functions.o $(RREIO)
-#	cd packages/ && xargs -L1 ../bin/retro-extend ../rre.image <list
 	rm rre.image
 
 bin/retro-barebones: bin/retro-embedimage bin/retro-extend interfaces/image.c interfaces/barebones.c interfaces/barebones.forth
diff --git a/interfaces/rre_image.c b/interfaces/rre_image.c
index 29748e2..8ba6d8f 100644
--- a/interfaces/rre_image.c
+++ b/interfaces/rre_image.c
@@ -3,15 +3,15 @@ int32_t ngaImageCells = 14890;
 int32_t ngaImage[] = { 1793,14841,14868,14889,201906,0,10,1,10,2,10,3,10,4,10,5,10,6,10,
                        7,10,8,10,9,10,10,10,11,10,12,10,13,10,14,10,15,10,16,10,
                        17,10,18,10,19,10,20,10,21,10,22,10,23,10,24,10,25,10,26,10,
-                       68223234,1,2575,85000450,1,656912,355,339,268505089,66,65,135205121,66,10,101384453,0,9,10,2049,59,
+                       68223234,1,2575,85000450,1,656912,142,141,268505089,66,65,135205121,66,10,101384453,0,9,10,2049,59,
                        25,459011,77,524546,77,302256641,1,10,16974595,0,50529798,10,25,524547,96,50529798,10,17108738,1,251790353,
                        101777669,1,17565186,87,524545,91,67,167838467,-1,134287105,3,62,659457,3,459023,108,2049,59,25,2049,
                        108,1793,115,2049,115,117506307,0,108,0,524545,25,113,168820993,0,127,1642241,127,134283523,7,113,
                        1793,108,7,524545,2049,108,1793,108,16846593,127,142,141,1793,67,16846593,127,113,141,1793,67,
                        7,10,659713,1,659713,2,659713,3,17108737,3,2,524559,108,2049,108,2049,108,2049,122,168820998,
-                       2,656,1025,167841793,180,5,17826049,0,180,2,15,25,524546,165,134287105,181,96,2305,182,459023,
+                       2,14868,1025,167841793,180,5,17826049,0,180,2,15,25,524546,165,134287105,181,96,2305,182,459023,
                        190,134287361,181,185,659201,180,2049,59,25,84152833,48,286458116,10,459014,205,184618754,45,25,16974851,-1,
-                       168886532,1,134284289,1,214,134284289,0,205,660227,32,0,0,112,114,101,102,105,120,58,32,
+                       168886532,1,134284289,1,214,134284289,0,205,660227,32,0,0,112,114,101,102,105,120,58,105,
                        0,285278479,231,7,2576,524546,82,1641217,1,167838467,228,2049,244,2049,240,524545,231,200,17826050,230,
                        0,2572,2563,2049,221,1793,134,459023,134,17760513,147,3,167,8,251727617,3,2,2049,161,268501264,
                        -1,127,10,2049,200,2049,161,459023,134,285282049,3,2,16846593,127,-1,127,134283536,1793,108,16846593,
@@ -51,7 +51,7 @@ int32_t ngaImage[] = { 1793,14841,14868,14889,201906,0,10,1,10,2,10,3,10,4,10,5,
                        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
                        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
                        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-                       0,0,0,0,0,0,59,0,58,105,110,118,111,107,101,0,114,0,95,49,
+                       0,0,0,0,0,0,105,109,97,103,101,58,115,97,118,101,0,103,101,0,
                        48,50,53,44,95,72,101,97,112,95,64,95,0,85,78,68,0,100,0,0,
                        72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,0,
                        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -179,7 +179,7 @@ int32_t ngaImage[] = { 1793,14841,14868,14889,201906,0,10,1,10,2,10,3,10,4,10,5,
                        2065,4097,3312,10,3480,3538,134,84,101,109,112,83,116,114,105,110,103,115,0,32,
                        3523,3556,134,84,101,109,112,83,116,114,105,110,103,77,97,120,0,512,3539,3568,
                        147,83,84,82,73,78,71,83,0,2049,1543,3841,3538,3841,3556,19,18,10,3557,3588,
-                       134,67,117,114,114,101,110,116,0,30,10,3577,3603,147,115,58,112,111,105,110,
+                       134,67,117,114,114,101,110,116,0,0,10,3577,3603,147,115,58,112,111,105,110,
                        116,101,114,0,3841,3588,3841,3556,19,2049,3568,17,10,3590,3622,147,115,58,110,101,
                        120,116,0,1,3588,2049,3009,3841,3588,3841,3538,11,1793,3638,1,0,4097,3588,10,1,
                        3633,9,10,3557,3652,147,115,58,116,101,109,112,0,2,2049,82,2049,2908,2049,3603,
@@ -425,7 +425,7 @@ int32_t ngaImage[] = { 1793,14841,14868,14889,201906,0,10,1,10,2,10,3,10,4,10,5,
                        82,2049,2583,1,367,1,11,2049,67,10,1,8437,2049,2065,2049,2908,10,1,8432,2049,
                        2252,2049,367,10,8332,8477,147,115,58,101,118,97,108,117,97,116,101,0,2049,8358,
                        2049,4655,2049,8358,2,2049,8380,2049,8430,10,8463,8495,134,76,80,0,0,8489,8505,134,
-                       73,110,100,101,120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+                       73,110,100,101,120,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,
                        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
                        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
                        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -444,7 +444,7 @@ int32_t ngaImage[] = { 1793,14841,14868,14889,201906,0,10,1,10,2,10,3,10,4,10,5,
                        2,2049,2908,4,16,10,8807,8841,147,105,111,58,101,110,117,109,101,114,97,116,
                        101,0,27,10,8825,8855,147,105,111,58,113,117,101,114,121,0,28,10,8843,8870,
                        147,105,111,58,105,110,118,111,107,101,0,29,10,8857,8880,134,83,108,111,116,
-                       0,0,8857,8896,147,105,111,58,115,99,97,110,45,102,111,114,0,1,-1,4097,
+                       0,7,8857,8896,147,105,111,58,115,99,97,110,45,102,111,114,0,1,-1,4097,
                        8880,2049,8841,1793,8922,2049,8688,2049,8855,772,67502597,11,1793,8918,2049,8688,4097,8880,10,1,
                        8913,9,10,1,8904,2049,8745,3,3841,8880,10,8881,8939,147,99,58,112,117,116,0,
                        1793,8941,1,0,2049,8870,10,8930,8952,147,110,108,0,1,10,2049,8939,10,8946,8963,