aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-10-10 07:22:10 +0000
committerdos-reis <gdr@axiomatics.org>2007-10-10 07:22:10 +0000
commit371a162e7759102786eca794c46ac28c3dc68789 (patch)
tree1b74574099c7481abf1e59fa54e4a02212d51ace /config
parentec3275dadba53ec37908b049d11833f20f5dc857 (diff)
downloadopen-axiom-371a162e7759102786eca794c46ac28c3dc68789.tar.gz
2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac.pamphlet: Tidy. Don't instantiate src/lisp/core.lisp. * configure.ac: Regenerate. * configure: Likewise. * config/var-def.mk (open_axiom_installdir): New. (AXIOM): Support versioning. * Makefile.pamphlet (install): Tidy. Remove sections on SPAD and SYS variables. * Makefile.in: Regenerate. src/algebra/ 2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (INTERPSYS): Now take system root directory and algebra directory as arguments. * Makefile.in: Regenerate. src/etc/ 2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (INTERPSYS): Take system root directory and algebra directory as arguments. * Makefile.in: Regenerate. src/interp/ 2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * bookvol5.pamphlet (initroot): Use |systemRootDirectory| instead of environment variable AXIOM. (|loadExposureGroupData|): Likewise. * br-data.boot.pamphlet (dbHasExamplePage): Likewise. (dbRead): Likewise. (dbReadComments): Likewise. (buildGloss): Likewise. * br-saturn.boot.pamphlet (getSaturnExampleList): Likewise. * br-search.boot.pamphlet (grepSplit): Likewise. * daase.lisp.pamphlet (asharp): Likewise. (initial-getdatabase): Likewise. (DaaseName): Likewise. (create-initializers): Likewise. * ht-root.boot.pamphlet (htGlossPage): Likewise. * htcheck.boot.pamphlet (buildHtMacroTable): Likewise. * i-syscmd.boot.pamphlet (summary): Likewise. (copyright): Likewise. * patches.lisp.pamphlet (restart0): Likewise. * util.lisp.pamphlet (sourcepath): Likewise. * Makefile.pamphlet (OBJS): Include sys-driver.$(FASLEXT). (${SAVESYS}): Tidy. (${AXIOMSYS}): Likewise. (${DEPSYS}): Depend on sys-driver.$(FASLEXT). Load it. (sys-driver.$(FASLEXT)): New rule. * Makefile.in: Regenerate. * sys-driver.boot: New. src/lisp/ 2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * core.lisp.in (|%systemOptions|): New. (|%systemArguments|): Likewise. (|$systemInstallationDirectory|): Likewise. (|$sysOpts|): Likewise. (|$sysArgs|): Likewise. (|handleCommandLine|): Tidy. (|printUsage|): Update. * Makefile.pamphlet (core.lisp): Instantiate here. src/script/ 2007-10-10 Gabriel Dos Reis <gdr@cs.tamu.edu> * axiom.in (AXIOM): Use value substituted by Autoconf. Remove dead code.
Diffstat (limited to 'config')
-rw-r--r--config/var-def.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/config/var-def.mk b/config/var-def.mk
index 32e5c572..3281f17a 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -160,7 +160,7 @@ axiom_c_macros = $(axiom_configdir)/axiom-c-macros.h
LATEX = @LATEX@
## Staging directory for the target DESTDIR
-axiom_targetdir = $(top_builddir)/target/$(target)
+axiom_targetdir = $(top_builddir)/$(target)
axiom_target_bindir = $(axiom_targetdir)/bin
axiom_target_libdir = $(axiom_targetdir)/lib
axiom_target_srcdir = $(axiom_targetdir)/src
@@ -172,6 +172,10 @@ axiom_target_texdir = $(axiom_target_datadir)/texmf/tex
## Where OpenAxiom keeps the tarballs for optional components
axiom_optional_srcdir = $(abs_top_srcdir)/zips
+## The final directory where OpenAxiom is installed. This is usually
+## the directory deduced or specified at configuration time.
+open_axiom_installdir = @open_axiom_installdir@
+
INC=$(top_srcdir)/src/include
PLF=@PLF@
CCF=@CCF@
@@ -185,7 +189,7 @@ AXIOM_X11_LDFLAGS = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
axiom_includes = -I$(axiom_src_srcdir)/include -I$(axiom_configdir)
## Where the staging build directory is found
-AXIOM = $(top_builddir)/target/$(target)
+AXIOM = $(top_builddir)/$(target)
## Where to find OpenAxiom data bases.
DAASE = $(axiom_src_datadir)