From 4cb9865f1f45370aed17d63f42437fdd67e9c993 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sat, 29 Jul 2017 17:42:52 +0200 Subject: [PATCH] 1.725; pass --*dir opts to meson contrary to --help output they accept absolute paths --- rpm-build-macros.spec | 2 +- rpm.macros | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 554555d..bec7c67 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -1,4 +1,4 @@ -%define rpm_macros_rev 1.724 +%define rpm_macros_rev 1.725 %define find_lang_rev 1.40 Summary: PLD Linux RPM build macros Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD diff --git a/rpm.macros b/rpm.macros index de484b2..188b0c8 100644 --- a/rpm.macros +++ b/rpm.macros @@ -332,6 +332,18 @@ LDFLAGS="${LDFLAGS:-%{rpmldflags}}" \ %{__meson} \ --buildtype=plain \ --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --sbindir=%{_sbindir} \ + --sysconfdir=%{_sysconfdir} \ + --datadir=%{_datadir} \ + --includedir=%{_includedir} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} \ + --localstatedir=%{_localstatedir} \ + --sharedstatedir=%{_sharedstatedir} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --localedir=%{_localedir} \ } # ninja -- 2.44.0