From 632933d5d0f00cdd397c28daa7cb2486f4d81a58 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 27 Apr 2004 11:58:38 +0000 Subject: [PATCH] revert: Makefile.def (flags_to_pass): Remove *dir variables that are passed to the modules via... 2004-04-27 Paolo Bonzini Revert: 2004-04-26 Paolo Bonzini * 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 --- ChangeLog | 10 ++++++++++ Makefile.def | 15 +++++++++++++++ Makefile.in | 15 +++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/ChangeLog b/ChangeLog index 22aa6ff48be..6bf744f6a9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-04-27 Paolo Bonzini + + Revert: + 2004-04-26 Paolo Bonzini + + * 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 Add patches from libtool CVS. diff --git a/Makefile.def b/Makefile.def index 6e164702422..e8e207aca58 100644 --- 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 29e7cd1f122..8f609051914 100644 --- 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)" \ -- 2.30.2