diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build.macros.in | 11 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- Rename %configure to %main_configure and add shims + for %configure and %configure2_5x to use it - Remove redundant %__debug_install_post as it breaks split debuginfo and debugsource subpackage generation - Remove find-lang.pl in favor of using upstream find-lang.sh diff --git a/build.macros.in b/build.macros.in index ce8c877..dda96c5 100644 --- a/build.macros.in +++ b/build.macros.in @@ -232,7 +232,7 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o %{__fix_dlsearch_path_in_libtool_for_multilib} $CONFIGURE_TOP %{_lib} # This is an improved version of %configure (from PLD team). -%configure \ +%main_configure \ %before_configure ; \ %{?_legacy_autotools:%{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \ %{!?_legacy_autotools:%{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \ @@ -255,6 +255,15 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o --infodir=%{_infodir} \\\ $CONFIGURE_XPATH +# Implement configure shims +%configure \ + %define _legacy_autotools 1 \ + %main_configure + +%configure2_5x \ + %main_configure + + #--------------------------------------------------------------------- # Expanded at beginning of %install scriptlet. # |