From 94959a8e7991c09ecaa72ca1c3fdc326ddb28819 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 21 Feb 2014 14:09:17 +0000
Subject: Set derived src and target directory variables

---
 Makefile.in | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index fe4830ea..c3c10aa3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -407,13 +407,6 @@ 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@
@@ -433,8 +426,20 @@ oa_optimize_options = @oa_optimize_options@
 oa_quiet_flags = @oa_quiet_flags@
 oa_shrlib_flags = @oa_shrlib_flags@
 oa_shrobj_flags = @oa_shrobj_flags@
+oa_src_algdir = @oa_src_algdir@
+oa_src_datadir = @oa_src_datadir@
+oa_src_docdir = @oa_src_docdir@
+oa_src_srcdir = @oa_src_srcdir@
+oa_src_texdir = @oa_src_texdir@
 oa_standard_linking = @oa_standard_linking@
-oa_top_builddir = @oa_top_builddir@
+oa_target_bindir = @oa_target_bindir@
+oa_target_datadir = @oa_target_datadir@
+oa_target_docdir = @oa_target_docdir@
+oa_target_includedir = @oa_target_includedir@
+oa_target_libdir = @oa_target_libdir@
+oa_target_srcdir = @oa_target_srcdir@
+oa_target_texdir = @oa_target_texdir@
+oa_targetdir = @oa_targetdir@
 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@
@@ -1025,13 +1030,13 @@ $(OA_SRC_TARGETS):
 	cd src && $(MAKE) $(AM_MAKEFLAGS) $@
 
 .PHONY: all-gcl
-all-gcl: $(oa_builddir)/bin/gcl$(EXEEXT)
+all-gcl: $(oa_target_bindir)/gcl$(EXEEXT)
 
-$(oa_builddir)/bin/gcl$(EXEEXT):
+$(oa_target_bindir)/gcl$(EXEEXT):
 	if test "$(srcdir)" != "$(builddir)" -a ! -d gcl; then \
 	   cp -r "$(srcdir)"/gcl "$(builddir)"; \
 	fi; cd gcl; \
-	./configure --prefix="$(oa_builddir)" ${GCLOPTS} && \
+	./configure --prefix="$(abs_top_builddir)/$(target)" ${GCLOPTS} && \
 		$(MAKE) $(AM_MAKEFLAGS) && $(MAKE) $(AM_MAKEFLAGS) install
 
 install:
-- 
cgit v1.2.3