Fix from previous commit

5 files changed, 21 insertions, 30 deletions

diff --git a/Makefile.am b/Makefile.am
index 3e2ddbc5..f97fc512 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,6 +45,9 @@ ACLOCAL_AMFLAGS = -I config --install --output=config/aclocal.m4
 
 SUBDIRS = @oa_gcldir@ src
 
+oa_builddir = $(abs_top_builddir)/build/$(target)
+oa_installdir = @open_axiom_installdir@
+
 # Configure options to GCL.
 GCLOPTS=@GCLOPTS@
 
@@ -70,8 +73,7 @@ OA_SRC_TARGETS = \
 
 .PHONY: all-oa $(OA_SRC_TARGETS)
 
-$(OA_SRC_TARGETS): stamp-rootdirs
-all-src: stamp-rootdirs @oa_all_prerequisites@
+all-src: @oa_all_prerequisites@
 
 if OA_BUILD_GCL
 all-recursive all-boot all-lisp all-interpsys all-axiomsys \
@@ -85,24 +87,20 @@ $(OA_SRC_TARGETS):
 all-algstrap:
 	cd src/algebra && $(MAKE) $@
 
-stamp-rootdirs:
-	@$(STAMP) stamp-rootdirs
-
-
 .PHONY: all-gcl
-all-gcl: $(axiom_build_bindir)/gcl$(EXEEXT)
+all-gcl: $(oa_builddir)/bin/gcl$(EXEEXT)
 
-$(axiom_build_bindir)/gcl$(EXEEXT):
+$(oa_builddir)/bin/gcl$(EXEEXT):
 	if test "$(srcdir)" != "$(builddir)" -a ! -d gcl; then \
 	   cp -r "$(srcdir)"/gcl "$(builddir)"; \
 	fi; cd gcl; \
-	./configure --prefix="$(axiom_abs_builddir)" ${GCLOPTS} && \
+	./configure --prefix="$(oa_builddir)" ${GCLOPTS} && \
 		$(MAKE) && $(MAKE) install
 
 install-exec-local:
 	@echo Installing OpenAxiom in $(DESTDIR)$(prefix)
-	@$(mkinstalldirs) "$(DESTDIR)$(open_axiom_installdir)"
-	cp -pr "$(builddir)"/$(target)/* "$(DESTDIR)$(open_axiom_installdir)"
+	@$(mkinstalldirs) "$(DESTDIR)$(oa_installdir)"
+	cp -pr "$(builddir)"/$(target)/* "$(DESTDIR)$(oa_installdir)"
 	rm -f "$(DESTDIR)$(bindir)"/open-axiom
 	@$(mkinstalldirs) "$(DESTDIR)$(bindir)"
 	$(INSTALL_PROGRAM) src/driver/open-axiom$(EXEEXT) "$(DESTDIR)$(bindir)"
@@ -112,8 +110,6 @@ install-exec-local:
 check:
 	cd src && $(MAKE) all-check
 
-
 clean-local:
-	@-rm -rf "$(axiom_targetdir)"
+	@-rm -rf $(target)
 	@-rm -rf build
-	@-rm -f stamp-*
diff --git a/Makefile.in b/Makefile.in
index 5b2f1087..fdafb6f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -358,6 +358,8 @@ top_srcdir = @top_srcdir@
 void_type = @void_type@
 ACLOCAL_AMFLAGS = -I config --install --output=config/aclocal.m4
 SUBDIRS = @oa_gcldir@ src
+oa_builddir = $(abs_top_builddir)/build/$(target)
+oa_installdir = @open_axiom_installdir@
 OA_SRC_TARGETS = \
 	all-algebra \
 	all-asq \
@@ -914,8 +916,7 @@ uninstall-am:
 
 .PHONY: all-oa $(OA_SRC_TARGETS)
 
-$(OA_SRC_TARGETS): stamp-rootdirs
-all-src: stamp-rootdirs @oa_all_prerequisites@
+all-src: @oa_all_prerequisites@
 
 @OA_BUILD_GCL_TRUE@all-recursive all-boot all-lisp all-interpsys all-axiomsys \
 @OA_BUILD_GCL_TRUE@  all-algebra all-input: all-gcl
@@ -927,23 +928,20 @@ $(OA_SRC_TARGETS):
 all-algstrap:
 	cd src/algebra && $(MAKE) $@
 
-stamp-rootdirs:
-	@$(STAMP) stamp-rootdirs
-
 .PHONY: all-gcl
-all-gcl: $(axiom_build_bindir)/gcl$(EXEEXT)
+all-gcl: $(oa_builddir)/bin/gcl$(EXEEXT)
 
-$(axiom_build_bindir)/gcl$(EXEEXT):
+$(oa_builddir)/bin/gcl$(EXEEXT):
 	if test "$(srcdir)" != "$(builddir)" -a ! -d gcl; then \
 	   cp -r "$(srcdir)"/gcl "$(builddir)"; \
 	fi; cd gcl; \
-	./configure --prefix="$(axiom_abs_builddir)" ${GCLOPTS} && \
+	./configure --prefix="$(oa_builddir)" ${GCLOPTS} && \
 		$(MAKE) && $(MAKE) install
 
 install-exec-local:
 	@echo Installing OpenAxiom in $(DESTDIR)$(prefix)
-	@$(mkinstalldirs) "$(DESTDIR)$(open_axiom_installdir)"
-	cp -pr "$(builddir)"/$(target)/* "$(DESTDIR)$(open_axiom_installdir)"
+	@$(mkinstalldirs) "$(DESTDIR)$(oa_installdir)"
+	cp -pr "$(builddir)"/$(target)/* "$(DESTDIR)$(oa_installdir)"
 	rm -f "$(DESTDIR)$(bindir)"/open-axiom
 	@$(mkinstalldirs) "$(DESTDIR)$(bindir)"
 	$(INSTALL_PROGRAM) src/driver/open-axiom$(EXEEXT) "$(DESTDIR)$(bindir)"
@@ -954,9 +952,8 @@ check:
 	cd src && $(MAKE) all-check
 
 clean-local:
-	@-rm -rf "$(axiom_targetdir)"
+	@-rm -rf $(target)
 	@-rm -rf build
-	@-rm -f stamp-*
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/build-setup.sh b/build-setup.sh
index 8d715fbd..f564b378 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -9,7 +9,7 @@ error() {
 
 rm -rf autom4te.cache
 autoheader || error "could not re-generate config/openaxiom-c-macros.h"
-aclocal --output=config/aclocal.m4  -I config --install --force
+aclocal --output=config/aclocal.m4  -I config --install
 automake -a -c
 autoconf || error "could not re-generate configure"
 rm -rf autom4te.cache
diff --git a/config/var-def.mk b/config/var-def.mk
index 4c740b3e..cae6a0a3 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -197,9 +197,6 @@ axiom_target_texdir = $(axiom_target_datadir)/texmf/tex
 oa_target_includedir = $(axiom_targetdir)/include
 
 
-## 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@
diff --git a/src/Makefile.in b/src/Makefile.in
index d6efda33..a50866c8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -80,3 +80,4 @@ clean-local: mostlyclean-local
 
 distclean-local: clean-local
 
+install: