aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--build.macros.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 45c6f49..a869ef4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- build.macros: drop legacy --x-includes= and --x-libraries= from configure macros
+
Version 2.48 - 2 January 2020, by Jani Välimaa
- build.macros: add build_* flags and set_build_flags macro from upstream rpm
- build.macros: add __global_* macros for compatibility with Fedora
diff --git a/build.macros.in b/build.macros.in
index 2496fe5..749d3ab 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -233,7 +233,6 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
%{?_legacy_autotools:%{?!_disable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \
%{!?_legacy_autotools:%{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}}} \
[ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
- CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
$CONFIGURE_TOP/configure %{!?_legacy_autotools:--build=}%{_target_platform} \\\
%{?_program_prefix:--program-prefix=%{_program_prefix}} \\\
--prefix=%{_prefix} \\\
@@ -248,8 +247,7 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
--localstatedir=%{_localstatedir} \\\
--sharedstatedir=%{_sharedstatedir} \\\
--mandir=%{_mandir} \\\
- --infodir=%{_infodir} \\\
- $CONFIGURE_XPATH
+ --infodir=%{_infodir}
# Implement configure shims
%configure \