Set derived src and target directory variables

2 files changed, 32 insertions, 39 deletions

diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index c00eaaec..5a7712ef 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -9,19 +9,22 @@ dnl -- OPENAXIOM_CANONICAL_SYSTEM --
 dnl --------------------------------
 AC_DEFUN([OPENAXIOM_CANONICAL_SYSTEM],[
 AC_CANONICAL_SYSTEM
-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_src_srcdir,'$(top_srcdir)/src')
+AC_SUBST(oa_src_docdir,'$(oa_src_srcdir)/doc')
+AC_SUBST(oa_src_datadir,'$(oa_src_srcdir)/share')
+AC_SUBST(oa_src_algdir,'$(oa_src_srcdir)/algebra')
+AC_SUBST(oa_src_texdir,'$(oa_src_datadir)/tex')
+
+AC_SUBST(oa_targetdir,'$(top_builddir)/$(target)')
+AC_SUBST(oa_target_bindir,'$(oa_targetdir)/bin')
+AC_SUBST(oa_target_libdir,'$(oa_targetdir)/lib')
+AC_SUBST(oa_target_srcdir,'$(oa_targetdir)/src')
+AC_SUBST(oa_target_docdir,'$(oa_targetdir)/doc')
+AC_SUBST(oa_target_datadir,'$(oa_targetdir)/share')
+AC_SUBST(oa_target_texdir,'$(oa_target_datadir)/texmf/tex')
+AC_SUBST(oa_target_includedir,'$(oa_targetdir)/include')
+
 AC_SUBST(oa_configdir,'$(top_builddir)/config')
 AC_SUBST(oa_c_macros,'$(oa_configdir)/axiom-c-macros.h')
 ])
diff --git a/config/var-def.mk b/config/var-def.mk
index a52c3785..21f8e5fe 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -152,36 +152,26 @@ oa_standard_linking = @oa_standard_linking@
 ## Notice, this is the src/ directory within the toplevel source
 ## directory 
 
-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
-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
+oa_src_srcdir = @oa_src_srcdir@
+oa_src_docdir = @oa_src_docdir@
+oa_src_datadir = @oa_src_datadir@
+oa_src_algdir = @oa_src_algdir@
+oa_src_texdir = @oa_src_texdir@
+
+oa_configdir = @oa_configdir@
+oa_c_macros = @oa_c_macros@
 
 LATEX = @LATEX@
 
 ## Staging directory for the target DESTDIR
-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
+oa_targetdir = @oa_targetdir@
+oa_target_bindir = @oa_target_bindir@
+oa_target_libdir = @oa_target_libdir@
+oa_target_srcdir = @oa_target_srcdir@
+oa_target_docdir = @oa_target_docdir@
+oa_target_datadir = @oa_target_datadir@
+oa_target_texdir = @oa_target_texdir@
+oa_target_includedir = @oa_target_includedir@
 
 
 ## The final directory where OpenAxiom is installed.  This is usually