Fix Befunge-98 FFI, and correct manual to match

diff --git a/buildaux/Makefile.am b/buildaux/Makefile.am
index 6302bc701b8097a3f6e515b055069916f09eabdb..6238a6c0dcf8e3305eddbae8e1ad445416b48b0e 100644 (file)
--- a/buildaux/Makefile.am
+++ b/buildaux/Makefile.am
@@ -34,6 +34,8 @@ syslib7.7i : pit/lib/syslib7.7i
        $(LN_S) -f `test -f 'pit/lib/syslib.7i' || echo '$(srcdir)/'`pit/lib/syslib7.7i syslib7.7i
 floatlib.i : pit/lib/floatlib.i
        $(LN_S) -f `test -f 'pit/lib/floatlib.i' || echo '$(srcdir)/'`pit/lib/floatlib.i floatlib.i
+ecto_b98.c : pit/explib/ecto_b98.c
+       $(LN_S) -f `test -f 'pit/explib/ecto_b98.c' || echo '$(srcdir)/'`pit/explib/ecto_b98.c ecto_b98.c
 ick_ec.h : src/ick_ec.h
        $(LN_S) -f `test -f 'src/ick_ec.h' || echo '$(srcdir)/'`src/ick_ec.h ick_ec.h
 ick_lose.h : src/ick_lose.h
@@ -52,7 +54,7 @@ AM_YFLAGS = -d
 # create symlinks used by ick to find files if it's run without first being
 # installed.
 BUILT_SOURCES = parser.h ick-wrap.c pickwrap.c syslib.i syslib3.3i syslib4.4i \
-                syslib5.5i syslib6.6i syslib7.7i floatlib.i \
+                syslib5.5i syslib6.6i syslib7.7i floatlib.i ecto_b98.c \
                ick_ec.h fiddle.h abcess.h ick_bool.h ick_lose.h yuk.h
 noinst_LIBRARIES = libidiot.a
 libidiot_a_SOURCES = src/idiotism.oil
@@ -80,7 +82,9 @@ bin2c$(EXEEXT):
 # Optional libraries are in lib_LIBRARIES, but with a null build rule.
 lib_LIBRARIES = libick.a libickmt.a libickec.a libyuk.a libick_ecto_b98.a
 libick_ecto_b98_a_SOURCES =
-libick_ecto_b98.a:
+libick_ecto_b98.a: etc/libick_ecto_b98.a
+       -(test -f etc/libick_ecto_b98.a || test -f $(srcdir)/etc/libick_ecto_b98.a) && $(LN_S) -f `test -f 'etc/libick_ecto_b98.a' || echo '$(srcdir)/'`etc/libick_ecto_b98.a libick_ecto_b98.a
+etc/libick_ecto_b98.a:
 libick_a_SOURCES = src/cesspool.c src/numerals.c src/ick_lose.c src/fiddle.c \
                    src/arrgghh.c src/clc-cset.c src/uncommon.c
 libick_a_LIBADD = atari.o baudot.o ebcdic.o latin1.o
@@ -156,7 +160,7 @@ CLEANFILES = oilout*.c parser.y lexer.l ick-wrap.c pickwrap.c \
              atari.c baudot.c ebcdic.c latin1.c ick.dvi \
              syslib.i syslib3.3i syslib4.4i syslib5.5i \
              syslib6.6i syslib7.7i ick_ec.h fiddle.h abcess.h \
-             ick_lose.h yuk.h floatlib.i ick_bool.h
+             ick_lose.h yuk.h floatlib.i ecto_b98.c ick_bool.h
 # Distclean deletes the Makefile and thus requires reconfiguring,
 # and therefore this is a safe moment to delete the build tree
 # versions of the prebuilt files. (The source tree versions will

diff --git a/doc/ick.txi b/doc/ick.txi
index 22997545f37d32749111d04f776ccb98644c3e49..522b4880a600f7d5535c0920eb6fa0cc37a5464c 100644 (file)
--- a/doc/ick.txi
+++ b/doc/ick.txi
@@ -5566,18 +5566,18 @@ must be compiled.  (After the library has been compiled, then you will
 need to reinstall @cic{}; however, you will not need to recompile
 @cic{}.)
 
-At present, only the cfunge Funge-98 interpreter can be converted into
-a library suitable for use by @cic{}; also, doing this is only
-supported on POSIX systems (although if someone gets it to work on
-DOS/Windows, the author of this manual would be interested to hear
-about it.)  Also, a source-code distribution (rather than a binary
-distribution) is needed.  One way to obtain the latest cfunge sources
-is via the bzr version-control system, using the following command
-(correct as of the time of writing, but as always, links can become
-dead):
+At present, only the cfunge Funge-98 interpreter
+(@uref{https://launchpad.net/cfunge/+index}) can be converted into a
+library suitable for use by @cic{}; also, doing this is only supported
+on POSIX systems (although if someone gets it to work on DOS/Windows,
+the author of this manual would be interested to hear about it.)
+Also, a source-code distribution (rather than a binary distribution)
+is needed.  One way to obtain the latest cfunge sources is via the bzr
+version-control system, using the following command (correct as of the
+time of writing, but as always, links can become dead):
 
 @example
-bzr branch http://rage.kuonet.org/~anmaster/bzr/cfunge
+bzr branch lp:cfunge
 @end example
 
 (As a licensing note, note that cfunge is licensed under the GNU

diff --git a/etc/cftoec.sh b/etc/cftoec.sh
old mode 100644 (file)
new mode 100755 (executable)