From ac136e818759d62bd8eabad781aabdba9a7f589e Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 3 Feb 2014 10:01:34 +0000 Subject: Fix global variable names in Makefiles --- config/open-axiom.m4 | 4 +++- config/setup-dep.mk | 16 ++++++------- config/var-def.mk | 65 ++++++++++++++++++---------------------------------- 3 files changed, 33 insertions(+), 52 deletions(-) (limited to 'config') diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 410923b1..e25b609a 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -119,7 +119,7 @@ case $oa_include_gcl,$AXIOM_LISP in ## User may explicilty specify --enable-gcl, but may be missing ## the dependency tarball. if test -d ${srcdir}/gcl; then - AXIOM_LISP='$(axiom_build_bindir)/gcl' + AXIOM_LISP='$(oa_build_bindir)/gcl' oa_include_gcl=yes elif test -z "$oa_include_gcl"; then AC_MSG_ERROR([OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, ECL, CLisp, Clozure CL), or get the dependency tarball from OpenAxiom download website.]) @@ -182,6 +182,8 @@ else esac fi AC_MSG_RESULT([$axiom_lisp_flavor]) +AM_CONDITIONAL([OA_ECL_RT],[test $axiom_lisp_flavor = ecl]) +AM_CONDITIONAL([OA_STANDARD_LINKING],[test $oa_standard_linking = yes]) AC_DEFINE_UNQUOTED([OPENAXIOM_BASE_RTS], [Runtime::${axiom_lisp_flavor}], diff --git a/config/setup-dep.mk b/config/setup-dep.mk index 939da9b5..7e7731fe 100644 --- a/config/setup-dep.mk +++ b/config/setup-dep.mk @@ -79,23 +79,23 @@ maintainer-clean-recursive: .PRECIOUS: %.tex .PRECIOUS: %.dvi -DVI_FILES = $(addprefix $(axiom_target_docdir)/$(subdir), \ +DVI_FILES = $(addprefix $(oa_target_docdir)/$(subdir), \ $(pamphlets:.pamphlet=.dvi)) pamphlets_SOURCES = $(addprefix $(srcdir)/, $(pamphlets)) .PHONY: dvi dvi-ax dvi: dvi-recursive -dvi-ax: $(axiom_build_texdir)/axiom.sty $(DVI_FILES) +dvi-ax: $(oa_build_texdir)/axiom.sty $(DVI_FILES) -$(axiom_target_docdir)/$(subdir)%.dvi: $(builddir)/%.dvi - $(mkinstalldirs) $(axiom_target_docdir)/$(subdir) +$(oa_target_docdir)/$(subdir)%.dvi: $(builddir)/%.dvi + $(mkinstalldirs) $(oa_target_docdir)/$(subdir) $(INSTALL_DATA) $< $@ -%.dvi: %.tex $(axiom_build_texdir)/axiom.sty - TEXINPUTS=".:$(axiom_build_texdir):$${TEXINPUTS}"; \ +%.dvi: %.tex $(oa_build_texdir)/axiom.sty + TEXINPUTS=".:$(oa_build_texdir):$${TEXINPUTS}"; \ export TEXINPUTS; \ - BIBINPUTS=".:$(axiom_build_texdir):$${TEXINPUTS}"; \ + BIBINPUTS=".:$(oa_build_texdir):$${TEXINPUTS}"; \ export BIBINPUTS; \ $(oa_hammer) --latex $< @@ -135,7 +135,7 @@ clean-ax: clean-generic clean-local .PHONY: distclean-generic distclean-local distclean distclean-ax distclean-generic: clean-generic - @-rm -rf $(axiom_target_docdir)/$(subdir) + @-rm -rf $(oa_target_docdir)/$(subdir) distclean: distclean-recursive distclean-ax: distclean-generic distclean-local diff --git a/config/var-def.mk b/config/var-def.mk index b89d3c88..be1ef880 100644 --- a/config/var-def.mk +++ b/config/var-def.mk @@ -98,7 +98,6 @@ endif oa_shrobj_flags = @oa_shrobj_flags@ oa_shrlib_flags = @oa_shrlib_flags@ -AUTOCONF = autoconf AWK = @AWK@ INSTALL = @INSTALL@ install_sh = @install_sh@ @@ -115,7 +114,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ## we are explicitly overrding that value here. LN_S = ln -s mkinstalldirs = $(top_srcdir)/config/mkinstalldirs -PATCH = @PATCH@ RANLIB = @RANLIB@ TOUCH = @TOUCH@ @@ -154,34 +152,21 @@ oa_standard_linking = @oa_standard_linking@ ## Notice, this is the src/ directory within the toplevel source ## directory -axiom_src_srcdir = $(top_srcdir)/src -axiom_src_docdir = $(axiom_src_srcdir)/doc -axiom_src_datadir = $(axiom_src_srcdir)/share -axiom_src_algdir = $(axiom_src_srcdir)/algebra -axiom_src_texdir = $(axiom_src_datadir)/tex +oa_src_srcdir = $(top_srcdir)/src +oa_src_docdir = $(oa_src_srcdir)/doc +oa_src_datadir = $(oa_src_srcdir)/share +oa_src_algdir = $(oa_src_srcdir)/algebra +oa_src_texdir = $(oa_src_datadir)/tex ## Where tools for the build machine are built -# Tools that we occasionally build don't know -# much about Autoconf and related infrastructure. Therefore -# we do lot by "hand". For the moment, things work if we specify -# paths as absolute, as opposed to relative. Other parts of -# OpenAxiom also expect absolute paths. -axiom_abs_top_builddir = $(abs_top_builddir) -axiom_abs_builddir = $(abs_top_builddir)/build/$(build) -axiom_abs_build_bindir = $(axiom_abs_builddir)/bin -axiom_abs_build_libdir = $(axiom_abs_builddir)/lib -axiom_abs_build_mandir = $(axiom_abs_builddir)/man -axiom_abs_build_datadir = $(axiom_abs_builddir)/share -axiom_abs_build_texdir = $(axiom_abs_build_datadir)/texmf/tex - axiom_top_builddir = $(top_builddir)/build -axiom_builddir = $(axiom_top_builddir)/$(build) -axiom_build_bindir = $(axiom_builddir)/bin -axiom_build_libdir = $(axiom_builddir)/lib -axiom_build_mandir = $(axiom_builddir)/man -axiom_build_docdir = $(axiom_builddir)/doc -axiom_build_datadir = $(axiom_builddir)/share -axiom_build_texdir = $(axiom_build_datadir)/texmf/tex +oa_builddir = $(axiom_top_builddir)/$(build) +oa_build_bindir = $(oa_builddir)/bin +oa_build_libdir = $(oa_builddir)/lib +oa_build_mandir = $(oa_builddir)/man +oa_build_docdir = $(oa_builddir)/doc +oa_build_datadir = $(oa_builddir)/share +oa_build_texdir = $(oa_build_datadir)/texmf/tex axiom_configdir = $(top_builddir)/config axiom_c_macros = $(axiom_configdir)/axiom-c-macros.h @@ -189,14 +174,14 @@ axiom_c_macros = $(axiom_configdir)/axiom-c-macros.h LATEX = @LATEX@ ## Staging directory for the target DESTDIR -axiom_targetdir = $(top_builddir)/$(target) -axiom_target_bindir = $(axiom_targetdir)/bin -axiom_target_libdir = $(axiom_targetdir)/lib -axiom_target_srcdir = $(axiom_targetdir)/src -axiom_target_docdir = $(axiom_targetdir)/doc -axiom_target_datadir = $(axiom_targetdir)/share -axiom_target_texdir = $(axiom_target_datadir)/texmf/tex -oa_target_includedir = $(axiom_targetdir)/include +oa_targetdir = $(top_builddir)/$(target) +oa_target_bindir = $(oa_targetdir)/bin +oa_target_libdir = $(oa_targetdir)/lib +oa_target_srcdir = $(oa_targetdir)/src +oa_target_docdir = $(oa_targetdir)/doc +oa_target_datadir = $(oa_targetdir)/share +oa_target_texdir = $(oa_target_datadir)/texmf/tex +oa_target_includedir = $(oa_targetdir)/include ## The final directory where OpenAxiom is installed. This is usually @@ -219,13 +204,13 @@ axiom_use_x = @axiom_use_x@ AXIOM_X11_CFLAGS = @X_CFLAGS@ AXIOM_X11_LDFLAGS = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ -axiom_includes = -I$(axiom_src_srcdir)/include -I$(axiom_configdir) +axiom_includes = -I$(oa_src_srcdir)/include -I$(axiom_configdir) ## Where the staging build directory is found AXIOM = $(top_builddir)/$(target) ## Where to find OpenAxiom data bases. -DAASE = $(axiom_src_datadir) +DAASE = $(oa_src_datadir) ## ------------------------------------------- ## -- Files generated for the build machine -- @@ -250,11 +235,5 @@ endif OA_QT_MOC = @OA_QT_MOC@ OA_QT_QMAKE = @OA_QT_QMAKE@ -## -AXIOMXLROOT=${AXIOM}/compiler - -## Lisp command to end a session. -BYE=bye - ## Clear suffix-based implicit rule table. .SUFFIXES: -- cgit v1.2.3