[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Axiom-developer] Clean(er) FreeBSD build working [patch]
|
From: |
Mark Murray |
|
Subject: |
[Axiom-developer] Clean(er) FreeBSD build working [patch] |
|
Date: |
Thu, 13 Nov 2003 17:03:48 +0000 |
Hi
Enclosed is a really clean (but not perfect) FreeBSD build for
Axiom. The GCL used is GCL-HEAD with some fixes to make it work
on FreeBSD. I suspect that it will work with stock GCL-2.6.1,
once that has been ported.
NOTES:
For FreeBSD, we need the build to use external ports where possible,
so GCL and noweb are assumed to be installed on the system already.
For the purposes of building the FreeBSD port that will go on the
CDS, and will be binary-installable off the 'net, this makes the
cleanest solution. I will ensure that the FreeBSD GCL and noweb are
suitably fixed for the job.
There is a weird 'ifneq "FreeBSD" "FreeBSD"'/'endif' check in the
patch; I'm not much of a noweb/gmake hacker, so this is a placeholder
that says "On FreeBSD please don't do this bit". I'm sure that there
is a much better way of doing this. Any suggestions?
If GCLVERSION is set to "gcl-system", then GCL is not built locally,
and the system GCL is used instead. I've used some patches of Camm
Maguire's, and I could easily have broken other builds. Suggestions
on how to do this properly for all cases requested!
I fixed some linuxism's (I think).
I've partially documented my stuff. It may need some padding out.
At one stage, I had utterly remoived all mention of noweb. Some of
this remains. Please ignore bits where I seem to have hacked too
hard.
There are some compile-fixes where I passed ${CCF} to the CC command
line - this is so that the X includes can be picked up. Is there a
cleaner way to do this?
Axiom is a great program! Thanks for enabling its use! :-)
M
--
Mark Murray
iumop ap!sdn w,I idlaH
Index: Makefile
===================================================================
RCS file: /cvsroot/axiom/axiom/Makefile,v
retrieving revision 1.5
diff -u -d -r1.5 Makefile
--- Makefile 11 Nov 2003 05:19:24 -0000 1.5
+++ Makefile 13 Nov 2003 08:29:56 -0000
@@ -5,7 +5,8 @@
#GCLVERSION=gcl-2.4.1
#GCLVERSION=gcl-2.5
#GCLVERSION=gcl-2.5.2
-GCLVERSION=gcl-2.6.1
+#GCLVERSION=gcl-2.6.1
+GCLVERSION=gcl-system
GCLDIR=${LSP}/${GCLVERSION}
SRC=${SPD}/src
INT=${SPD}/int
@@ -18,7 +19,7 @@
CCLBASE=${OBJ}/${SYS}/ccl/ccllisp
INSTALL=/usr/local/axiom
COMMAND=${INSTALL}/mnt/${SYS}/bin/axiom
-TANGLE=${SPADBIN}/lib/notangle
+TANGLE=notangle
NOISE="-o ${TMP}/trace"
@@ -46,6 +47,7 @@
@mkdir -p ${OBJ}/noweb
@mkdir -p ${TMP}
@mkdir -p ${MNT}/${SYS}/bin/lib
+ifneq "FreeBSD" "FreeBSD"
@( cd ${OBJ}/noweb ; \
tar -zxf ${ZIPS}/noweb-2.10a.tgz ; \
cd ${OBJ}/noweb/src ; \
@@ -57,6 +59,7 @@
${MAKE} BIN=${MNT}/${SYS}/bin/lib LIB=${MNT}/${SYS}/bin/lib \
MAN=${MNT}/${SYS}/bin/man \
TEXINPUTS=${MNT}/${SYS}/bin/tex all install >${TMP}/trace )
+endif
@echo The file marks the fact that noweb has been made > noweb
nowebclean:
Index: Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/Makefile.pamphlet,v
retrieving revision 1.15
diff -u -d -r1.15 Makefile.pamphlet
--- Makefile.pamphlet 11 Nov 2003 05:19:24 -0000 1.15
+++ Makefile.pamphlet 13 Nov 2003 08:29:57 -0000
@@ -184,7 +184,7 @@
CCLBASE=${OBJ}/${SYS}/ccl/ccllisp
INSTALL=/usr/local/axiom
COMMAND=${INSTALL}/mnt/${SYS}/bin/axiom
-TANGLE=${SPADBIN}/lib/notangle
+TANGLE=notangle
NOISE="-o ${TMP}/trace"
@@ -237,6 +237,7 @@
@mkdir -p ${OBJ}/noweb
@mkdir -p ${TMP}
@mkdir -p ${MNT}/${SYS}/bin/lib
+ifneq "FreeBSD" "FreeBSD"
@( cd ${OBJ}/noweb ; \
tar -zxf ${ZIPS}/noweb-2.10a.tgz ; \
cd ${OBJ}/noweb/src ; \
@@ -248,6 +249,7 @@
${MAKE} BIN=${MNT}/${SYS}/bin/lib LIB=${MNT}/${SYS}/bin/lib \
MAN=${MNT}/${SYS}/bin/man \
TEXINPUTS=${MNT}/${SYS}/bin/tex all install >${TMP}/trace )
+endif
@echo The file marks the fact that noweb has been made > noweb
nowebclean:
@@ -371,15 +373,15 @@
@echo 78 installing Axiom in ${INSTALL}
@mkdir -p ${INSTALL}
@cp -pr ${MNT} ${INSTALL}
- @echo AXIOM=${INSTALL}/mnt/${SYS} >${COMMAND}
- @cat ${SRC}/etc/axiomcmd >>${COMMAND}
+ @echo '#!/bin/sh -' >${COMMAND}
+ @echo AXIOM=${INSTALL}/mnt/${SYS} >>${COMMAND}
+ @cat ${SRC}/etc/axiom >>${COMMAND}
@chmod +x ${COMMAND}
@echo 79 Axiom installation finished.
@echo
@echo Please add $(shell dirname ${COMMAND}) to your PATH variable
@echo Start Axiom with the command $(shell basename ${COMMAND})
@echo
-
@
\subsection{document}
@@ -506,6 +508,11 @@
optimizations for function calling in Axiom. This is handled automatically
by changing this variable.
+If GCLVERSION is ``gcl-system'', then no GCL is not built locally,
+and it is assumed that the ``gcl'' command is available off the
+path. If this GCL is unsuitable for building Axiom, then very bad
+things will happen.
+
NOTE WELL: IF YOU CHANGE THIS YOU SHOULD ERASE THE lsp/Makefile FILE.
This will cause the build to remake the lsp/Makefile from the
lsp/Makefile.pamphlet file and get the correct version. If you
@@ -514,7 +521,8 @@
#GCLVERSION=gcl-2.4.1
#GCLVERSION=gcl-2.5
#GCLVERSION=gcl-2.5.2
-GCLVERSION=gcl-2.6.1
+#GCLVERSION=gcl-2.6.1
+GCLVERSION=gcl-system
@
\subsection{Makefile.axposf1v3}
@@ -810,6 +818,51 @@
<<clean>>
@
+\subsection{Makefile.freebsd}
+Annoyingly enough it seems that GCL uses a default extension of .lsp
+rather than .lisp so we add the {\bf LISP} variable here. We need to
+depend on the default extension behavior because the system build
+will load either the interpreted or compiled form of a file depending
+on which is available. This varies at different stages of the build.
+<<Makefile.freebsd>>=
+# System dependent Makefile for the freebsd platform
+# Platform variable
+PLF:=FREEBSDplatform
+# C compiler flags
+CCF:="-O -pipe -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF}
-I/usr/X11R6/include -I/usr/local/include"
+# Loader flags
+LDF:="-L/usr/X11R6/lib -L/usr/local/lib"
+# C compiler to use
+CC:=gcc
+AWK=awk
+RANLIB=ranlib
+TOUCH=touch
+TAR=tar
+AXIOMXLROOT=${AXIOM}/compiler
+O=o
+BYE=bye
+LISP=lsp
+DAASE=${SRC}/share
+
+ENV=PLF=${PLF} CCF=${CCF} LDF=${LDF} CC=${CC} AWK=${AWK} RANLIB=${RANLIB} \
+ TOUCH=${TOUCH} TAR=${TAR} AXIOMXLROOT=${AXIOMXLROOT} O=${O} BYE=${BYE} \
+ LISP=${LISP} DAASE=${DAASE} TANGLE=${TANGLE}
+
+all: rootdirs srcsetup lspdir srcdir
+ @echo 45 Makefile.freebsd called
+ @echo 46 Environment : ${ENV}
+ @echo 47 finished system build on `date` | tee >lastBuildDate
+
+<<rootdirs>>
+<<noweb>>
+<<literate commands>>
+<<srcsetup>>
+<<src>>
+<<lsp>>
+<<document>>
+<<clean>>
+
+@
\subsection{Makefile.linux}
Annoyingly enough it seems that GCL uses a default extension of .lsp
rather than .lisp so we add the {\bf LISP} variable here. We need to
@@ -1291,7 +1344,5 @@
Bath BA2 5QR UK Tel. +44-1225-837430
{\bf http://www.codemist.co.uk}
\bibitem{4} \$SPAD/zips/noweb-2.10a.tgz, the noweb source tree
-\bibitem{5} \$SPAD/zips/advi-1.2.0.tar.gz, the advi source tree
\end{thebibliography}
\end{document}
-
Index: README
===================================================================
RCS file: /cvsroot/axiom/axiom/README,v
retrieving revision 1.6
diff -u -d -r1.6 README
--- README 7 Nov 2003 21:03:59 -0000 1.6
+++ README 13 Nov 2003 08:30:00 -0000
@@ -8,16 +8,18 @@
=======================================================================
Type:
-./configure
+$ ./configure
=======================================================================
================= MAKING AXIOM ========================================
=======================================================================
-cd /spad << where you unpacked the sources
-export AXIOM=/spad/mnt/linux << which axiom to build
-make << build the system
- << a system build takes 2+ hours at 2Ghz
+$ cd /spad << where you unpacked the sources
+$ export AXIOM=/spad/mnt/linux
+or
+$ export AXIOM=/spad/mnt/freebsd << etc; which axiom to build
+$ make << build the system
+ << the build takes 2+ hours at 2Ghz
When the make completes you'll have an executable called $AXIOM/bin/axiom
@@ -27,14 +29,14 @@
You can install Axiom on your system by typing (as root):
-make install
+# make install
This will put Axiom into /usr/local/axiom
and the axiom command in /usr/local/bin/axiom
You can change these defaults to anything thus:
-make INSTALL=/home/me/myaxiom COMMAND=/home/me/bin/myaxiom install
+# make INSTALL=/home/me/myaxiom COMMAND=/home/me/bin/myaxiom install
=====================================================================
@@ -49,7 +51,7 @@
In general every directory will contain a Makefile.dvi file.
These files document facts about how Axiom is built.
-The directory mnt/linux/doc will contain .dvi files as they are written.
+The directory mnt/${SYS}/doc will contain .dvi files as they are written.
Axiom is free and open source software. It is copyrighted code that
is released under the Modified BSD license. Much debate about this
@@ -307,17 +309,7 @@
Literate programs are a combination of documentation and source code
kept in a pamphlet file. There have to be tools to deconstruct the
pamphlet into useable components. At the current time we are using a
-system called noweb that was developed by Norman Ramsey. The source
-code for noweb is in the zips directory. You can uncompress it,
-compile it, and install it into the Axiom executable directory by
-typing:
-
- make noweb
-
-By default, if the noweb directory does not exist it will
-be built as needed simply typing:
-
- make
+system called noweb that was developed by Norman Ramsey.
Every directory contains a Makefile.pamphlet and typing:
@@ -399,7 +391,6 @@
doc
obj
tmp
- noweb
SYS=(linux,...)
mnt
SYS=(linux,...)
@@ -537,9 +528,9 @@
FAQ 2: axiom.sty is not found
-The build of noweb creates 3 files in the mnt/linux/bin directory:
+The build of noweb creates 3 files in the mnt/${SYS}/bin directory:
notangle, noweave, and tex/axiom.sty. The build of the src/scripts
-directory copies the document command to the mnt/linux/bin
+directory copies the document command to the mnt/${SYS}/bin
directory. These four files are necessary to rebuild a Makefile.
These can be recreated in a clean system by typing:
@@ -551,7 +542,7 @@
A pamphlet file was modified and has a syntax error. The document
command has its output redirected to a file called
-obj/linux/tmp/trace. Latex has found the syntax error and put up a
+obj/${SYS}/tmp/trace. Latex has found the syntax error and put up a
prompt which stops the make. Look in this file for the error. You can
also see the error by rerunning make thus:
@@ -559,16 +550,6 @@
which will override the redirection and allow the latex output to go
to the console.
-
-FAQ 4: noweb needs to be rebuilt
-
-The first time noweb is built a dummy file called noweb
-is written into the top level directory. If this file is
-removed noweb will be rebuilt. The following sequence should work:
-
- rm noweb
- make noweb
-
FAQ 5: lisp needs to be rebuilt
Index: lsp/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/lsp/Makefile.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 Makefile.pamphlet
--- lsp/Makefile.pamphlet 12 Nov 2003 11:16:14 -0000 1.4
+++ lsp/Makefile.pamphlet 13 Nov 2003 08:30:00 -0000
@@ -461,15 +461,48 @@
echo 20 applying toploop patch to unixport/init_gcl.lsp ; \
patch <${SPD}/zips/${GCLVERSION}.unixport.init_gcl.lsp.patch )
@
+\subsection{GCL already installed}
+<<gcl-system>>=
+# locally installed GCL
+OUT=${OBJ}/${SYS}/bin
+
+all:
+ @echo 21 building ${LSP} ${GCLVERSION}
+
+gcldir:
+ @echo 22 building for ${GCLVERSION}
+ echo "(compiler::link nil \"${OUT}/lisp\" \"(setq
compiler::*default-system-p* t)\" \"${OBJ}/${SYS}/lib/cfuns-c.o
${OBJ}/${SYS}/lib/sockio-c.o ${OBJ}/${SYS}/lib/libspad.a\")" | gcl
+ @echo 23 finished gcl build on `date` | tee >gcldir
+
+ccldir: ${LSP}/ccl/Makefile
+ @echo 24 building CCL
+ @mkdir -p ${INT}/ccl
+ @mkdir -p ${OBJ}/${SYS}/ccl
+ @( cd ccl ; ${ENV} ${MAKE} )
+
+${LSP}/ccl/Makefile: ${LSP}/ccl/Makefile.pamphlet
+ @echo 25 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
+ @( cd ccl ; ${SPADBIN}/document ${NOISE} Makefile )
+
+document:
+ @echo 26 making docs in ${LSP}
+ @mkdir -p ${INT}/doc/lsp/ccl
+ @( cd ccl ; ${ENV} ${MAKE} document )
+
+clean:
+ @echo 27 cleaning ${LSP}/ccl
+ @( cd ccl ; ${ENV} ${MAKE} clean )
+@
+\eject
<<*>>=
# gcl version 2.4.1
OUT=${OBJ}/${SYS}/bin
all:
- @echo 14 building ${LSP} ${GCLVERSION}
+ @echo 28 building ${LSP} ${GCLVERSION}
gcldir:
- @echo 15 building ${GCLVERSION}
+ @echo 29 building ${GCLVERSION}
@tar -zxf ${ZIPS}/${GCLVERSION}.tgz
<<gcl-2.4.1.socket.patch>>
<<gcl-2.4.1.fortran.patch>>
@@ -479,25 +512,25 @@
./configure --enable-vssize=65536 ; \
${ENV} ${MAKE} ; \
cp unixport/saved_gcl ${OUT}/lisp )
- @echo 21 finished system build on `date` | tee >gcldir
+ @echo 30 finished system build on `date` | tee >gcldir
ccldir: ${LSP}/ccl/Makefile
- @echo 22 building CCL
+ @echo 31 building CCL
@mkdir -p ${INT}/ccl
@mkdir -p ${OBJ}/${SYS}/ccl
@( cd ccl ; ${ENV} ${MAKE} )
${LSP}/ccl/Makefile: ${LSP}/ccl/Makefile.pamphlet
- @echo 23 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
+ @echo 32 making ${LSP}/ccl/Makefile from ${LSP}/ccl/Makefile.pamphlet
@( cd ccl ; ${SPADBIN}/document ${NOISE} Makefile )
document:
- @echo 24 making docs in ${LSP}
+ @echo 33 making docs in ${LSP}
@mkdir -p ${INT}/doc/lsp/ccl
@( cd ccl ; ${ENV} ${MAKE} document )
clean:
- @echo 25 cleaning ${LSP}/ccl
+ @echo 34 cleaning ${LSP}/ccl
@( cd ccl ; ${ENV} ${MAKE} clean )
@
\eject
Index: src/booklets/Sorting.booklet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/booklets/Sorting.booklet,v
retrieving revision 1.1
diff -u -d -r1.1 Sorting.booklet
--- src/booklets/Sorting.booklet 28 Aug 2003 12:15:28 -0000 1.1
+++ src/booklets/Sorting.booklet 13 Nov 2003 08:30:04 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{/home/axiomgnu/new/mnt/linux/bin/tex/noweb}
+\usepackage{../../src/scripts/tex/noweb}
\begin{document}
\title{Sorting Facilities}
\author{Timothy Daly}
Index: src/clef/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/clef/Makefile.pamphlet,v
retrieving revision 1.2
diff -u -d -r1.2 Makefile.pamphlet
--- src/clef/Makefile.pamphlet 11 Nov 2003 05:03:44 -0000 1.2
+++ src/clef/Makefile.pamphlet 13 Nov 2003 08:30:04 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../mnt/linux/bin/axiom}
+\usepackage{../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/clef Makefile}
\author{Timothy Daly}
Index: src/clef/edible.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/clef/edible.c.pamphlet,v
retrieving revision 1.2
diff -u -d -r1.2 edible.c.pamphlet
--- src/clef/edible.c.pamphlet 31 Oct 2003 11:42:57 -0000 1.2
+++ src/clef/edible.c.pamphlet 13 Nov 2003 08:30:04 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../mnt/linux/bin/axiom}
+\usepackage{../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/clef edible.c}
\author{The Axiom Team}
Index: src/doc/axiom.bib.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/doc/axiom.bib.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 axiom.bib.pamphlet
--- src/doc/axiom.bib.pamphlet 28 Aug 2003 12:28:30 -0000 1.1
+++ src/doc/axiom.bib.pamphlet 13 Nov 2003 08:30:13 -0000
@@ -12231,7 +12231,7 @@
\subsection{Makefile}
<<Makefile>>=
@MISC{Makefile,
- path=./mnt/linux/bin/Makefile.pamphlet
+ path=./mnt/${SYS}/bin/Makefile.pamphlet
}
@
Index: src/etc/axiom
===================================================================
RCS file: /cvsroot/axiom/axiom/src/etc/axiom,v
retrieving revision 1.1
diff -u -d -r1.1 axiom
--- src/etc/axiom 31 Oct 2003 11:42:58 -0000 1.1
+++ src/etc/axiom 13 Nov 2003 08:30:13 -0000
@@ -1,3 +1 @@
$AXIOM/bin/clef -e $AXIOM/bin/AXIOMsys
-
-
Index: src/interp/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/Makefile.pamphlet,v
retrieving revision 1.7
diff -u -d -r1.7 Makefile.pamphlet
--- src/interp/Makefile.pamphlet 11 Nov 2003 05:03:45 -0000 1.7
+++ src/interp/Makefile.pamphlet 13 Nov 2003 08:30:17 -0000
@@ -563,8 +563,10 @@
@ echo '(load "${OUT}/c-util")' >> ${OUT}/makedep.lisp
@ echo '(unless (probe-file "${OUT}/g-util.${O}") (compile-file
"${OUT}/g-util.${LISP}" :output-file "${OUT}/g-util.${O}"))' >>
${OUT}/makedep.lisp
@ echo '(load "${OUT}/g-util")' >> ${OUT}/makedep.lisp
- @ (cd ${MNT}/${SYS}/bin ; \
- echo '(progn (load "${OUT}/makedep.lisp") (spad-save "${DEPSYS}"))'
| ${LISPSYS})
+# @ (cd ${MNT}/${SYS}/bin ; \
+# echo '(progn (load "${OUT}/makedep.lisp") (spad-save "${DEPSYS}"))'
| ${LISPSYS})
+ @ ( cd ${OBJ}/${SYS}/bin && \
+ echo '(setq si::*collect-binary-modules* t)(load
"${OUT}/makedep.lisp")(compiler::link (remove-duplicates si::*binary-modules*
:test (quote equal)) "$(DEPSYS)" "(setq si::*collect-binary-modules* t)(load
\"$(OUT)/makedep.lisp\")(gbc t)(when si::*binary-modules* (error
si::*binary-modules*))(setq si::collect-binary-modules* nil
si::*binary-modules* nil)(gbc t)(setq compiler::*default-system-p* t)" "" nil)'
| ${LISPSYS})
@ echo 4 ${DEPSYS} created
@
@@ -616,8 +618,10 @@
@ echo '#+:akcl (setq compiler::*suppress-compiler-notes* t)' >>
${OUT}/makeint.lisp
@ echo '#+:akcl (si::gbc-time 0)' >> ${OUT}/makeint.lisp
@ echo '#+:akcl (setq si::*system-directory* "${SPAD}/bin/")' >>
${OUT}/makeint.lisp
- @ (cd ${OBJ}/${SYS}/bin ; \
- echo '(progn (gbc t) (load "${OUT}/makeint.lisp") (gbc t)
(user::spad-save "${SAVESYS}"))' | ${LISPSYS} )
+# @ (cd ${OBJ}/${SYS}/bin ; \
+# echo '(progn (gbc t) (load "${OUT}/makeint.lisp") (gbc t)
(user::spad-save "${SAVESYS}"))' | ${LISPSYS} )
+ @ (cd ${OBJ}/${SYS}/bin && \
+ echo '(setq si::*collect-binary-modules* t)(setq x
si::*system-directory*)(load "${OUT}/makeint.lisp")(setq si::*system-directory*
x)(compiler::link (remove-duplicates si::*binary-modules* :test (quote equal))
"$(SAVESYS)" "(setq si::*collect-binary-modules* t)(load
\"$(OUT)/makeint.lisp\")(when si::*binary-modules* (error
si::*binary-modules*)(setq si::collect-binary-modules* nil si::*binary-modules*
nil)(setq compiler::*default-system-p* t)(gbc t))"
"$(OBJ)/$(SYS)/lib/sockio-c.o $(OBJ)/$(SYS)/lib/cfuns-c.o
$(OBJ)/$(SYS)/lib/libspad.a" nil)' | ${LISPSYS})
@ echo 6 ${SAVESYS} created
@ cp ${SAVESYS} ${AXIOMSYS}
@ echo 6a ${AXIOMSYS} created
Index: src/interp/debugsys.lisp.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/debugsys.lisp.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 debugsys.lisp.pamphlet
--- src/interp/debugsys.lisp.pamphlet 28 Aug 2003 14:23:38 -0000 1.1
+++ src/interp/debugsys.lisp.pamphlet 13 Nov 2003 08:30:18 -0000
@@ -79,7 +79,7 @@
(thesymb "/int/interp/buildom.clisp")
(thesymb "/int/interp/cattable.clisp")
(thesymb "/int/interp/cformat.clisp")
- (thesymb "/obj/linux/interp/cfuns.o")
+ (thesymb "/obj/${SYS}/interp/cfuns.o")
(thesymb "/int/interp/clam.clisp")
(thesymb "/int/interp/clammed.clisp")
(thesymb "/int/interp/comp.lisp")
@@ -152,7 +152,7 @@
(thesymb "/int/interp/sfsfun.clisp")
(thesymb "/int/interp/simpbool.clisp")
(thesymb "/int/interp/slam.clisp")
- (thesymb "/obj/linux/interp/sockio.o")
+ (thesymb "/obj/${SYS}/interp/sockio.o")
(thesymb "/int/interp/spad.lisp")
(thesymb "/int/interp/spaderror.lisp")
(thesymb "/int/interp/template.clisp")
@@ -232,13 +232,13 @@
())
(list
(thesymb "/int/interp/ax.clisp"))
- "/mnt/linux"
+ "/mnt/${SYS}"
"/lsp"
"/src"
"/int"
"/obj"
"/mnt"
- "linux")
+ "${SYS}")
(in-package "SCRATCHPAD-COMPILER")
(boot::set-restart-hook)
(in-package "BOOT")
@@ -247,7 +247,7 @@
(load (user::thepath "/int/interp/obey.lsp"))
;(si::multiply-bignum-stack 10)
(si::gbc-time 0)
-(setq si::*system-directory* (user::thepath "/mnt/linux/bin/"))
+(setq si::*system-directory* (user::thepath "/mnt/${SYS}/bin/"))
(gbc t)
@
Index: src/interp/util.lisp.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/interp/util.lisp.pamphlet,v
retrieving revision 1.2
diff -u -d -r1.2 util.lisp.pamphlet
--- src/interp/util.lisp.pamphlet 9 Oct 2003 10:46:23 -0000 1.2
+++ src/interp/util.lisp.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -68,10 +68,14 @@
;; perform system initializations for building a starter system
(init-memory-config)
#+:AKCL
- (let ((collectfn (concatenate 'string (string lsp) "/cmpnew/collectfn")))
- (unless (probe-file (concatenate 'string collectfn ".o"))
- (compile-file collectfn))
- (load collectfn)
+ (let ((collectfn (concatenate 'string si::*system-directory*
"../cmpnew/gcl_collectfn.lsp"))
+ (collectfn1 (concatenate 'string obj "/" sys "/interp/collectfn")))
+ (with-open-file (st collectfn :direction :input)
+ (with-open-file (st1 (concatenate 'string collectfn1 ".lsp") :direction
:output)
+ (si::copy-stream st st1)))
+ (unless (probe-file (concatenate 'string collectfn1 ".o"))
+ (compile-file collectfn1))
+ (load collectfn1)
(compiler::emit-fn t)
(mapcar
#'load
@@ -830,7 +834,7 @@
This function will do that. A correct call looks like:
\begin{verbatim}
(in-package "BOOT")
-(recompile-all-libs "/spad/mnt/linux/algebra")
+(recompile-all-libs "/spad/mnt/${SYS}/algebra")
\end{verbatim}
<<recompile-all-libs>>=
(defun recompile-all-libs (dir)
@@ -855,11 +859,11 @@
Note that it will build a pathname from the current {\bf AXIOM}
shell variable. So if the {\bf AXIOM} shell variable had the value
\begin{verbatim}
-/spad/mnt/linux
+/spad/mnt/${SYS}
\end{verbatim}
then the wildcard expands to
\begin{verbatim}
-/spad/mnt/linux/nalg/*.spad
+/spad/mnt/${SYS}/nalg/*.spad
\end{verbatim}
and all of the matching files would be recompiled.
<<recompile-all-algebra-files>>=
@@ -896,7 +900,7 @@
before compiling this file. A correct call looks like:
\begin{verbatim}
(in-package "BOOT")
-(reroot "/spad/mnt/linux")
+(reroot "/spad/mnt/${SYS}")
\end{verbatim}
<<reroot>>=
(defun reroot (dir)
Index: src/lib/Makefile.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/Makefile.pamphlet,v
retrieving revision 1.5
diff -u -d -r1.5 Makefile.pamphlet
--- src/lib/Makefile.pamphlet 11 Nov 2003 05:03:45 -0000 1.5
+++ src/lib/Makefile.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -256,7 +256,7 @@
${OUT}/pixmap.o: ${MID}/pixmap.c
@echo 34 making ${OUT}/pixmap.o from ${MID}/pixmap.c
@( cd ${OUT} ; \
- gcc -c -I${INC} ${MID}/pixmap.c )
+ gcc -c -I${INC} ${CCF} ${MID}/pixmap.c )
${DOCINT}/pixmap.c.dvi: ${IN}/pixmap.c.pamphlet
@echo 35 making ${DOCINT}/pixmap.c.dvi from ${IN}/pixmap.c.pamphlet
@@ -337,7 +337,7 @@
${OUT}/spadcolors.o: ${MID}/spadcolors.c
@echo 46 making ${OUT}/spadcolors.o from ${MID}/spadcolors.c
@( cd ${OUT} ; \
- gcc -c -I${INC} ${MID}/spadcolors.c )
+ gcc -c -I${INC} ${CCF} ${MID}/spadcolors.c )
${DOCINT}/spadcolors.c.dvi: ${IN}/spadcolors.c.pamphlet
@echo 47 making ${DOCINT}/spadcolors.c.dvi from \
@@ -363,7 +363,7 @@
${OUT}/util.o: ${MID}/util.c
@echo 50 making ${OUT}/util.o from ${MID}/util.c
@( cd ${OUT} ; \
- gcc -c -I${INC} ${MID}/util.c )
+ gcc -c -I${INC} ${CCF} ${MID}/util.c )
${DOCINT}/util.c.dvi: ${IN}/util.c.pamphlet
@echo 51 making ${DOCINT}/util.c.dvi from ${IN}/util.c.pamphlet
@@ -413,7 +413,7 @@
${OUT}/XDither.o: ${MID}/XDither.c
@echo 58 making ${OUT}/XDither.o from ${MID}/XDither.c
@( cd ${OUT} ; \
- gcc -c -I${INC} ${MID}/XDither.c )
+ gcc -c -I${INC} ${CCF} ${MID}/XDither.c )
${DOCINT}/XDither.c.dvi: ${IN}/XDither.c.pamphlet
@echo 59 making ${DOCINT}/XDither.c.dvi from ${IN}/XDither.c.pamphlet
@@ -438,7 +438,7 @@
${OUT}/XShade.o: ${MID}/XShade.c
@echo 62 making ${OUT}/XShade.o from ${MID}/XShade.c
@( cd ${OUT} ; \
- gcc -c -I${INC} ${MID}/XShade.c )
+ gcc -c -I${INC} ${CCF} ${MID}/XShade.c )
${DOCINT}/XShade.c.dvi: ${IN}/XShade.c.pamphlet
@echo 63 making ${DOCINT}/XShade.c.dvi from ${IN}/XShade.c.pamphlet
@@ -463,7 +463,7 @@
${OUT}/XSpadFill.o: ${MID}/XSpadFill.c
@echo 66 making ${OUT}/XSpadFill.o from ${MID}/XSpadFill.c
@( cd ${OUT} ; \
- gcc -c -I${INC} ${MID}/XSpadFill.c )
+ gcc -c -I${INC} ${CCF} ${MID}/XSpadFill.c )
${DOCINT}/XSpadFill.c.dvi: ${IN}/XSpadFill.c.pamphlet
@echo 67 making ${DOCINT}/XSpadFill.c.dvi from
${IN}/XSpadFill.c.pamphlet
@@ -496,6 +496,7 @@
<<Makefile.dvi>>=
${DOCMNT}/Makefile.dvi: ${SRC}/Makefile.dvi
@echo 71 making ${DOCMNT}/Makefile.dvi from ${SRC}/Makefile.dvi
+ @mkdir -p ${DOCMNT}
@cp ${SRC}/Makefile.dvi ${DOCMNT}/Makefile.dvi
@
Index: src/lib/XDither.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/XDither.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 XDither.c.pamphlet
--- src/lib/XDither.c.pamphlet 10 Nov 2003 18:47:25 -0000 1.3
+++ src/lib/XDither.c.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib XDither.c}
\author{The Axiom Team}
@@ -51,7 +51,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <malloc.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
Index: src/lib/XShade.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/XShade.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 XShade.c.pamphlet
--- src/lib/XShade.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/XShade.c.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib XShade.c}
\author{The Axiom Team}
@@ -50,7 +50,6 @@
#include "useproto.h"
#include <stdio.h>
-#include <malloc.h>
#include <stdlib.h>
#include <X11/Xlib.h>
Index: src/lib/XSpadFill.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/XSpadFill.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 XSpadFill.c.pamphlet
--- src/lib/XSpadFill.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/XSpadFill.c.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib XSpadFill.c}
\author{The Axiom Team}
Index: src/lib/axiom.xpm.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/axiom.xpm.pamphlet,v
retrieving revision 1.2
diff -u -d -r1.2 axiom.xpm.pamphlet
--- src/lib/axiom.xpm.pamphlet 10 Nov 2003 18:47:26 -0000 1.2
+++ src/lib/axiom.xpm.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib axiom.xpm}
\author{The Axiom Team}
Index: src/lib/bsdsignal.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/bsdsignal.c.pamphlet,v
retrieving revision 1.5
diff -u -d -r1.5 bsdsignal.c.pamphlet
--- src/lib/bsdsignal.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.5
+++ src/lib/bsdsignal.c.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib bsdsignal.c}
\author{The Axiom Team}
Index: src/lib/cfuns-c.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/cfuns-c.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 cfuns-c.c.pamphlet
--- src/lib/cfuns-c.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/cfuns-c.c.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib cfuns-c.c}
\author{The Axiom Team}
@@ -52,7 +52,6 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
-#include <malloc.h>
#include <sys/types.h>
#include <sys/stat.h>
Index: src/lib/cursor.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/cursor.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 cursor.c.pamphlet
--- src/lib/cursor.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/cursor.c.pamphlet 13 Nov 2003 08:30:19 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib cursor.c}
\author{Stephen Watt, James Wen}
Index: src/lib/edin.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/edin.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 edin.c.pamphlet
--- src/lib/edin.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/edin.c.pamphlet 13 Nov 2003 08:30:20 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib edin.c}
\author{The Axiom Team}
Index: src/lib/emupty.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/emupty.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 emupty.c.pamphlet
--- src/lib/emupty.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/emupty.c.pamphlet 13 Nov 2003 08:30:20 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib emupty.c}
\author{Nick Simicich}
Index: src/lib/fnct_key.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/fnct_key.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 fnct_key.c.pamphlet
--- src/lib/fnct_key.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/fnct_key.c.pamphlet 13 Nov 2003 08:30:20 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib fnct\_key.c}
\author{The Axiom Team}
@@ -352,7 +352,7 @@
close(fd);
}
}
- bsdSignal(SIGCLD, null_fnct,RestartSystemCalls);
+ bsdSignal(SIGCHLD, null_fnct,RestartSystemCalls);
switch (id = fork()) {
case -1:
perror("Special key");
Index: src/lib/halloc.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/halloc.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 halloc.c.pamphlet
--- src/lib/halloc.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/halloc.c.pamphlet 13 Nov 2003 08:30:20 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib halloc.c}
\author{The Axiom Team}
Index: src/lib/hash.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/hash.c.pamphlet,v
retrieving revision 1.1
diff -u -d -r1.1 hash.c.pamphlet
--- src/lib/hash.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.1
+++ src/lib/hash.c.pamphlet 13 Nov 2003 08:30:20 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{no title}
\author{The Axiom Team}
Index: src/lib/openpty.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/openpty.c.pamphlet,v
retrieving revision 1.5
diff -u -d -r1.5 openpty.c.pamphlet
--- src/lib/openpty.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.5
+++ src/lib/openpty.c.pamphlet 13 Nov 2003 08:30:21 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib openpty.c}
\author{The Axiom Team}
@@ -92,7 +92,7 @@
#endif
{
-#if defined(SUNplatform) || defined (HP9platform) || defined(LINUXplatform) ||
defined(RTplatform) ||defined(AIX370platform)
+#if defined(SUNplatform) || defined (HP9platform) || defined(LINUXplatform) ||
defined(RTplatform) ||defined(AIX370platform) || defined(FREEBSDplatform)
int looking = 1, i;
int oflag = O_RDWR; /* flag for opening the pty */
@@ -204,7 +204,7 @@
sprintf(serv, "/dev/ttyp%02x", channelNo);
channelNo++;
#endif
-#if defined(SUNplatform) || defined (HP9platform) || defined(linux)
+#if defined(SUNplatform) || defined (HP9platform) || defined(FREEBSDplatform)
|| defined(linux)
static int channelNo = 0;
static char group[] = "pqrstuvwxyzPQRST";
static int groupNo = 0;
Index: src/lib/pixmap.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/pixmap.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 pixmap.c.pamphlet
--- src/lib/pixmap.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/pixmap.c.pamphlet 13 Nov 2003 08:30:21 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib pixmap.c}
\author{The Axiom Team}
@@ -361,8 +361,7 @@
write_pixmap_file(Display *dsp, int scr, char *fn, Window wid, int x, int y,
int width,int height)
#endif
{
- XpmAttributes attr;
- XImage *xi,*xireturn;
+ XImage *xi;
int status;
/* reads image structure in ZPixmap format */
Index: src/lib/prt.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/prt.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 prt.c.pamphlet
--- src/lib/prt.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/prt.c.pamphlet 13 Nov 2003 08:30:22 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib prt.c}
\author{The Axiom Team}
Index: src/lib/sockio-c.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/sockio-c.c.pamphlet,v
retrieving revision 1.4
diff -u -d -r1.4 sockio-c.c.pamphlet
--- src/lib/sockio-c.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.4
+++ src/lib/sockio-c.c.pamphlet 13 Nov 2003 08:30:23 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib sockio-c.c}
\author{The Axiom Team}
Index: src/lib/spadcolors.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/spadcolors.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 spadcolors.c.pamphlet
--- src/lib/spadcolors.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/spadcolors.c.pamphlet 13 Nov 2003 08:30:23 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib spadcolors.c}
\author{The Axiom Team}
Index: src/lib/util.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/util.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 util.c.pamphlet
--- src/lib/util.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/util.c.pamphlet 13 Nov 2003 08:30:23 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib util.c}
\author{The Axiom Team}
Index: src/lib/wct.c.pamphlet
===================================================================
RCS file: /cvsroot/axiom/axiom/src/lib/wct.c.pamphlet,v
retrieving revision 1.3
diff -u -d -r1.3 wct.c.pamphlet
--- src/lib/wct.c.pamphlet 10 Nov 2003 18:47:26 -0000 1.3
+++ src/lib/wct.c.pamphlet 13 Nov 2003 08:30:24 -0000
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage{../../../../mnt/linux/bin/axiom}
+\usepackage{../../../../mnt/${SYS}/bin/axiom}
\begin{document}
\title{\$SPAD/src/lib wct.c}
\author{The Axiom Team}
@@ -287,7 +287,7 @@
printTime((long *)&(pwct->ftime));
cc = skimString(pwct->fimage, pwct->fsize, NHEAD, NTAIL);
printf("%s", " " + (cc - (NHEAD + NTAIL)));
- printf(" [%d w, %d c]", pwct->wordc, pwct->fsize);
+ printf(" [%d w, %ld c]", pwct->wordc, (long)pwct->fsize);
printf("\n");
#ifdef SHOW_WORDS
Index: src/scripts/document
===================================================================
RCS file: /cvsroot/axiom/axiom/src/scripts/document,v
retrieving revision 1.3
diff -u -d -r1.3 document
--- src/scripts/document 12 Nov 2003 11:16:15 -0000 1.3
+++ src/scripts/document 13 Nov 2003 08:30:24 -0000
@@ -1,12 +1,14 @@
#!/bin/sh
+
latex=`which latex`
if [ "$latex" = "" ] ; then
echo document ERROR You must install latex first
exit 0
fi
-tangle=$AXIOM/bin/lib/notangle
-weave=$AXIOM/bin/lib/noweave
+tangle=notangle
+weave=noweave
+
if [ "$#" = "3" ]; then
REDIRECT=$2
FILE=`basename $3 .pamphlet`
@@ -22,6 +24,7 @@
rm -f $FILE.aux
exit 0
fi
+
if [ "$#" = "1" ]; then
FILE=`basename $1 .pamphlet`
$tangle -t8 $FILE.pamphlet >$FILE
@@ -36,6 +39,5 @@
rm -f $FILE.aux
exit 0
fi
-echo "document [ -o redirect ] pamphlet"
-
+echo "document [ -o redirect ] pamphlet"
- [Axiom-developer] Clean(er) FreeBSD build working [patch],
Mark Murray <=