revert: Makefile.def (flags_to_pass): Remove *dir variables that are passed to the...

2004-04-27  Paolo Bonzini  <bonzini@gnu.org>

	Revert:
	2004-04-26  Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.def (flags_to_pass): Remove *dir variables that
	are passed to the modules via TOPLEVEL_CONFIGURE_ARGUMENTS,
	as well as prefix and exec_prefix.
	* Makefile.in: Regenerate.

From-SVN: r81221

diff --git a/ChangeLog b/ChangeLog
index 22aa6ff48bebb60726d496acecfbe6739672997e..6bf744f6a9dbb5f8b23f2b429e3815ed558fe7ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-27  Paolo Bonzini  <bonzini@gnu.org>
+
+       Revert:
+       2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
+
+       * Makefile.def (flags_to_pass): Remove *dir variables that
+       are passed to the modules via TOPLEVEL_CONFIGURE_ARGUMENTS,
+       as well as prefix and exec_prefix.
+       * Makefile.in: Regenerate.
+
 2004-04-26  Robert Millan  <robertmh@gnu.org>
 
        Add patches from libtool CVS.

diff --git a/Makefile.def b/Makefile.def
index 6e1647024229be0cccd4a6ee2d9ec16fec78c049..e8e207aca58361a061c0393b4bc79604f23452f3 100644 (file)
--- a/Makefile.def
+++ b/Makefile.def
@@ -144,8 +144,23 @@ recursive_targets = { make_target= maintainer-clean; };
 flags_to_pass = { flag= DESTDIR ; };
 flags_to_pass = { flag= RPATH_ENVVAR ; };
 flags_to_pass = { flag= TARGET_SUBDIR ; };
+flags_to_pass = { flag= bindir ; };
+flags_to_pass = { flag= datadir ; };
+flags_to_pass = { flag= exec_prefix ; };
+flags_to_pass = { flag= includedir ; };
+flags_to_pass = { flag= infodir ; };
+flags_to_pass = { flag= libdir ; };
+flags_to_pass = { flag= libexecdir ; };
+flags_to_pass = { flag= lispdir ; };
 flags_to_pass = { flag= libstdcxx_incdir ; };
+flags_to_pass = { flag= libsubdir ; };
+flags_to_pass = { flag= localstatedir ; };
+flags_to_pass = { flag= mandir ; };
 flags_to_pass = { flag= oldincludedir ; };
+flags_to_pass = { flag= prefix ; };
+flags_to_pass = { flag= sbindir ; };
+flags_to_pass = { flag= sharedstatedir ; };
+flags_to_pass = { flag= sysconfdir ; };
 flags_to_pass = { flag= tooldir ; };
 flags_to_pass = { flag= build_tooldir ; };
 flags_to_pass = { flag= gxx_include_dir ; };

diff --git a/Makefile.in b/Makefile.in
index 29e7cd1f122e4fe2c19f2290e4e4ce87e54d350f..8f609051914e0bdd9170e0119e4ca276b6d2f492 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -394,8 +394,23 @@ BASE_FLAGS_TO_PASS = \
        "DESTDIR=$(DESTDIR)" \
        "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
        "TARGET_SUBDIR=$(TARGET_SUBDIR)" \
+       "bindir=$(bindir)" \
+       "datadir=$(datadir)" \
+       "exec_prefix=$(exec_prefix)" \
+       "includedir=$(includedir)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "libexecdir=$(libexecdir)" \
+       "lispdir=$(lispdir)" \
        "libstdcxx_incdir=$(libstdcxx_incdir)" \
+       "libsubdir=$(libsubdir)" \
+       "localstatedir=$(localstatedir)" \
+       "mandir=$(mandir)" \
        "oldincludedir=$(oldincludedir)" \
+       "prefix=$(prefix)" \
+       "sbindir=$(sbindir)" \
+       "sharedstatedir=$(sharedstatedir)" \
+       "sysconfdir=$(sysconfdir)" \
        "tooldir=$(tooldir)" \
        "build_tooldir=$(build_tooldir)" \
        "gxx_include_dir=$(gxx_include_dir)" \