Updated build instructions

diff --git a/sapi/webjames/README b/sapi/webjames/README
index 10625a179e7cb825c0a552a459ac5cfe24a55266..9a316efed713b0a4ce246d9810abe08960ee0d95 100644 (file)
--- a/sapi/webjames/README
+++ b/sapi/webjames/README
@@ -7,26 +7,22 @@ RISC OS operating system.
 
 DOWNLOADS
 
-A recent (September 2001 or later) version of the GCCSDK cross compiler
+A recent (February 2002 or later) version of the GCCSDK cross compiler
 http://www.hard-mofo.dsvr.net/
 
-WebJames 0.31 or later
+WebJames 0.35 or later
 http://www.webjames.alexwaugh.com/
 
 
 BUILDING
 
-$ cd webjames
-
-Edit Makefile if nessacery
-
-$ make setup
-$ cd ../php4
+$ cd php4
 $ ./configure \
        --host=arm-riscos-aof \
-       --with-webjames=../webjames \
+       --with-webjames=../webjames/src \
        --with-config-file-path=/Choices: \
        other PHP options
 $ make install
 $ cd ../webjames
+$ ./configure --enable-php
 $ make

diff --git a/sapi/webjames/config.m4 b/sapi/webjames/config.m4
index db6247ae294cd02b652f10e16e9620e7d1a1e94a..1e6de60bf553156629aad83d1f25aaeef7c53f04 100644 (file)
--- a/sapi/webjames/config.m4
+++ b/sapi/webjames/config.m4
@@ -9,9 +9,7 @@ AC_ARG_WITH(webjames,
     echo '\\#Created by PHP configure' > $WEBJAMES/build/php; \
     echo 'PHP_LIBS = -l$abs_srcdir/$SAPI_STATIC \$(PHP_LIBS) \$(EXTRA_LIBS)' >> $WEBJAMES/build/php; \
     echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $WEBJAMES/build/php; \
-    echo 'PHP_CFLAGS = -DPHP \$(COMMON_FLAGS) \$(CFLAGS) \$(EXTRA_CFLAGS) -I$abs_srcdir/sapi/webjames' >> $WEBJAMES/build/php; \
-    echo 'WIMPSLOT = \$\$(WIMPSLOT_PHP)' >> $WEBJAMES/build/php; \
-    echo 'REMOVE_ATTRIBUTE=Action php-script.*' >> $WEBJAMES/build/php;"
+    echo 'PHP_CFLAGS = -DPHP \$(COMMON_FLAGS) \$(EXTRA_CFLAGS) -I$abs_srcdir/sapi/webjames' >> $WEBJAMES/build/php;"
   PHP_WEBJAMES="yes, using $WEBJAMES"
   PHP_ADD_INCLUDE($WEBJAMES)
   PHP_BUILD_STATIC