diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | config/open-axiom.m4 | 11 | ||||
| -rwxr-xr-x | configure | 31 | ||||
| -rw-r--r-- | src/Makefile.in | 10 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 14 | ||||
| -rw-r--r-- | src/io/Makefile.in | 10 | ||||
| -rw-r--r-- | src/lisp/Makefile.in | 2 | ||||
| -rw-r--r-- | src/rt/Makefile.in | 10 | ||||
| -rw-r--r-- | src/syntax/Makefile.in | 10 |
10 files changed, 107 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2014-02-21 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * config/open-axiom.m4 (OPENAXIOM_CANONICAL_SYSTEM): Set derived + OpenAxiom-specified build directories too. + 2014-02-10 Gabriel Dos Reis <gdr@integrable-solutions.net>> * config/open-axiom.m4: Clean up global variable names. diff --git a/Makefile.in b/Makefile.in index 5242fd31..fe4830ea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -407,9 +407,18 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +oa_build_bindir = @oa_build_bindir@ +oa_build_datadir = @oa_build_datadir@ +oa_build_docdir = @oa_build_docdir@ +oa_build_libdir = @oa_build_libdir@ +oa_build_mandir = @oa_build_mandir@ +oa_build_texdir = @oa_build_texdir@ +oa_builddir = $(abs_top_builddir)/build/$(target) +oa_c_macros = @oa_c_macros@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ oa_cflags = @oa_cflags@ +oa_configdir = @oa_configdir@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ @@ -425,6 +434,7 @@ oa_quiet_flags = @oa_quiet_flags@ oa_shrlib_flags = @oa_shrlib_flags@ oa_shrobj_flags = @oa_shrobj_flags@ oa_standard_linking = @oa_standard_linking@ +oa_top_builddir = @oa_top_builddir@ oa_use_dynamic_lib = @oa_use_dynamic_lib@ oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@ oa_use_x = @oa_use_x@ @@ -452,7 +462,6 @@ top_srcdir = @top_srcdir@ void_type = @void_type@ ACLOCAL_AMFLAGS = -I config #--install --output=config/aclocal.m4 DIST_SUBDIRS = src -oa_builddir = $(abs_top_builddir)/build/$(target) oa_installdir = @open_axiom_installdir@ OA_SRC_TARGETS = \ all-local \ diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 87c8c5a4..c00eaaec 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -13,6 +13,17 @@ oa_targetdir=$top_builddir/$target oa_target_bindir=$oa_targetdir/bin oa_target_libdir=$oa_targetdir/lib oa_target_includedir=$oa_targetdir/include + +AC_SUBST(oa_top_builddir,'$(top_builddir)/build') +AC_SUBST(oa_builddir,'$(oa_top_builddir)/$(build)') +AC_SUBST(oa_build_bindir,'$(oa_builddir)/bin') +AC_SUBST(oa_build_libdir,'$(oa_builddir)/lib') +AC_SUBST(oa_build_mandir,'$(oa_builddir)/man') +AC_SUBST(oa_build_docdir,'$(oa_builddir)/doc') +AC_SUBST(oa_build_datadir,'$(oa_builddir)/share') +AC_SUBST(oa_build_texdir,'$(oa_build_datadir)/texmf/tex') +AC_SUBST(oa_configdir,'$(top_builddir)/config') +AC_SUBST(oa_c_macros,'$(oa_configdir)/axiom-c-macros.h') ]) dnl -------------------------------------- @@ -773,6 +773,16 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +oa_c_macros +oa_configdir +oa_build_texdir +oa_build_datadir +oa_build_docdir +oa_build_mandir +oa_build_libdir +oa_build_bindir +oa_builddir +oa_top_builddir target_os target_vendor target_cpu @@ -3091,6 +3101,27 @@ oa_target_bindir=$oa_targetdir/bin oa_target_libdir=$oa_targetdir/lib oa_target_includedir=$oa_targetdir/include +oa_top_builddir='$(top_builddir)/build' + +oa_builddir='$(oa_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' + +oa_configdir='$(top_builddir)/config' + +oa_c_macros='$(oa_configdir)/axiom-c-macros.h' + + am__api_version='1.14' diff --git a/src/Makefile.in b/src/Makefile.in index aef3e9df..8c39ab3d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -337,9 +337,18 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +oa_build_bindir = @oa_build_bindir@ +oa_build_datadir = @oa_build_datadir@ +oa_build_docdir = @oa_build_docdir@ +oa_build_libdir = @oa_build_libdir@ +oa_build_mandir = @oa_build_mandir@ +oa_build_texdir = @oa_build_texdir@ +oa_builddir = @oa_builddir@ +oa_c_macros = @oa_c_macros@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ oa_cflags = @oa_cflags@ +oa_configdir = @oa_configdir@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ @@ -355,6 +364,7 @@ oa_quiet_flags = @oa_quiet_flags@ oa_shrlib_flags = @oa_shrlib_flags@ oa_shrobj_flags = @oa_shrobj_flags@ oa_standard_linking = @oa_standard_linking@ +oa_top_builddir = @oa_top_builddir@ oa_use_dynamic_lib = @oa_use_dynamic_lib@ oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@ oa_use_x = @oa_use_x@ diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 5cff1dbd..363a5079 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -522,9 +522,18 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +oa_build_bindir = $(oa_builddir)/bin +oa_build_datadir = @oa_build_datadir@ +oa_build_docdir = $(oa_builddir)/doc +oa_build_libdir = @oa_build_libdir@ +oa_build_mandir = @oa_build_mandir@ +oa_build_texdir = $(oa_builddir)/texmf/tex +oa_builddir = $(top_builddir)/build-$(build) +oa_c_macros = @oa_c_macros@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ oa_cflags = @oa_cflags@ +oa_configdir = @oa_configdir@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ @@ -540,6 +549,7 @@ oa_quiet_flags = @oa_quiet_flags@ oa_shrlib_flags = @oa_shrlib_flags@ oa_shrobj_flags = @oa_shrobj_flags@ oa_standard_linking = @oa_standard_linking@ +oa_top_builddir = @oa_top_builddir@ oa_use_dynamic_lib = @oa_use_dynamic_lib@ oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@ oa_use_x = @oa_use_x@ @@ -574,10 +584,6 @@ oa_target_datadir = $(oa_targetdir)/share oa_src_srcdir = $(top_srcdir)/src oa_src_docdir = $(top_srcdir)/doc oa_src_datadir = $(oa_src_srcdir)/share -oa_builddir = $(top_builddir)/build-$(build) -oa_build_bindir = $(oa_builddir)/bin -oa_build_texdir = $(oa_builddir)/texmf/tex -oa_build_docdir = $(oa_builddir)/doc top_confdir = $(top_srcdir)/config OUT = $(oa_targetdir)/algebra DOC = $(oa_target_docdir)/src/algebra diff --git a/src/io/Makefile.in b/src/io/Makefile.in index 86e59519..cc8d0346 100644 --- a/src/io/Makefile.in +++ b/src/io/Makefile.in @@ -334,9 +334,18 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +oa_build_bindir = @oa_build_bindir@ +oa_build_datadir = @oa_build_datadir@ +oa_build_docdir = @oa_build_docdir@ +oa_build_libdir = @oa_build_libdir@ +oa_build_mandir = @oa_build_mandir@ +oa_build_texdir = @oa_build_texdir@ +oa_builddir = @oa_builddir@ +oa_c_macros = @oa_c_macros@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ oa_cflags = @oa_cflags@ +oa_configdir = @oa_configdir@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ @@ -352,6 +361,7 @@ oa_quiet_flags = @oa_quiet_flags@ oa_shrlib_flags = @oa_shrlib_flags@ oa_shrobj_flags = @oa_shrobj_flags@ oa_standard_linking = @oa_standard_linking@ +oa_top_builddir = @oa_top_builddir@ oa_use_dynamic_lib = @oa_use_dynamic_lib@ oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@ oa_use_x = @oa_use_x@ diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in index 1cba7ca2..190142cf 100644 --- a/src/lisp/Makefile.in +++ b/src/lisp/Makefile.in @@ -35,8 +35,6 @@ oa_target_lispdir = $(oa_targetdir)/lisp subdir = src/lisp/ -pamphlets = Makefile.pamphlet - build_libdir = ./$(top_builddir)/src/lib ## Ideally, we would like to use Libtool for producing, and linking with, diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in index 30730d5e..86790856 100644 --- a/src/rt/Makefile.in +++ b/src/rt/Makefile.in @@ -334,9 +334,18 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +oa_build_bindir = @oa_build_bindir@ +oa_build_datadir = @oa_build_datadir@ +oa_build_docdir = @oa_build_docdir@ +oa_build_libdir = @oa_build_libdir@ +oa_build_mandir = @oa_build_mandir@ +oa_build_texdir = @oa_build_texdir@ +oa_builddir = @oa_builddir@ +oa_c_macros = @oa_c_macros@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ oa_cflags = @oa_cflags@ +oa_configdir = @oa_configdir@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ @@ -352,6 +361,7 @@ oa_quiet_flags = @oa_quiet_flags@ oa_shrlib_flags = @oa_shrlib_flags@ oa_shrobj_flags = @oa_shrobj_flags@ oa_standard_linking = @oa_standard_linking@ +oa_top_builddir = @oa_top_builddir@ oa_use_dynamic_lib = @oa_use_dynamic_lib@ oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@ oa_use_x = @oa_use_x@ diff --git a/src/syntax/Makefile.in b/src/syntax/Makefile.in index 601fefed..f296f207 100644 --- a/src/syntax/Makefile.in +++ b/src/syntax/Makefile.in @@ -334,9 +334,18 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +oa_build_bindir = @oa_build_bindir@ +oa_build_datadir = @oa_build_datadir@ +oa_build_docdir = @oa_build_docdir@ +oa_build_libdir = @oa_build_libdir@ +oa_build_mandir = @oa_build_mandir@ +oa_build_texdir = @oa_build_texdir@ +oa_builddir = @oa_builddir@ +oa_c_macros = @oa_c_macros@ oa_c_runtime = @oa_c_runtime@ oa_c_runtime_extra = @oa_c_runtime_extra@ oa_cflags = @oa_cflags@ +oa_configdir = @oa_configdir@ oa_delay_ffi = @oa_delay_ffi@ oa_editor = @oa_editor@ oa_enable_checking = @oa_enable_checking@ @@ -352,6 +361,7 @@ oa_quiet_flags = @oa_quiet_flags@ oa_shrlib_flags = @oa_shrlib_flags@ oa_shrobj_flags = @oa_shrobj_flags@ oa_standard_linking = @oa_standard_linking@ +oa_top_builddir = @oa_top_builddir@ oa_use_dynamic_lib = @oa_use_dynamic_lib@ oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@ oa_use_x = @oa_use_x@ |