diff options
| author | Neal Gompa <ngompa13@gmail.com> | 2017-07-30 19:37:50 -0400 |
|---|---|---|
| committer | Neal Gompa <ngompa13@gmail.com> | 2017-07-30 19:37:50 -0400 |
| commit | b0abbd1c63251b3de4a63a45cc09a718a993d24f (patch) | |
| tree | 95951c82657aaf5399857e248fb6b71817f939f5 /build.macros.in | |
| parent | ebae14c902cd319f62ccbdc11db0975f6f9792a9 (diff) | |
| download | rpm-setup-b0abbd1c63251b3de4a63a45cc09a718a993d24f.tar rpm-setup-b0abbd1c63251b3de4a63a45cc09a718a993d24f.tar.gz rpm-setup-b0abbd1c63251b3de4a63a45cc09a718a993d24f.tar.bz2 rpm-setup-b0abbd1c63251b3de4a63a45cc09a718a993d24f.tar.xz rpm-setup-b0abbd1c63251b3de4a63a45cc09a718a993d24f.zip | |
Rename %configure to %main_configure and add %configure shims
This allows %configure and %configure2_5x to use %main_configure and tweak it on the fly.
This is intended to be temporary until packages are fixed to use %configure properly.
Diffstat (limited to 'build.macros.in')
| -rw-r--r-- | build.macros.in | 11 |
1 files changed, 10 insertions, 1 deletions
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. # |