summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.def15
-rw-r--r--Makefile.in15
3 files changed, 7 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c74591c299..1a3f1f62751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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 Paolo Bonzini <bonzini@gnu.org>
+
* configure.in: Invoke ACX_PROG_CMP_IGNORE_INITIAL.
* configure: Regenerate.
* config/acx.m4: Mutuate ACX_PROG_CMP_IGNORE_INITIAL from gcc.
diff --git a/Makefile.def b/Makefile.def
index 5a68098157b..e257634bef0 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -144,23 +144,8 @@ 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 4084b2b5388..d8c0157108f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -394,23 +394,8 @@ 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)" \