From 716ab318300c8396dcb9433f48891331412955740b0e8529a5cebd854736a8b9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 3 Jan 2022 10:22:01 +0000 Subject: [PATCH] Accepting request 943548 from home:dirkmueller:Factory - fix pkgconfig pc file settings by passing in right prefix during build OBS-URL: https://build.opensuse.org/request/show/943548 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=72 --- zstd.changes | 5 +++++ zstd.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/zstd.changes b/zstd.changes index 04d0a7d..68adb80 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 3 09:18:49 UTC 2022 - Dirk Müller + +- fix pkgconfig pc file settings by passing in right prefix during build + ------------------------------------------------------------------- Mon Dec 27 14:59:02 UTC 2021 - Dirk Müller diff --git a/zstd.spec b/zstd.spec index f2dfccf..45fc6d2 100644 --- a/zstd.spec +++ b/zstd.spec @@ -1,7 +1,7 @@ # # spec file for package zstd # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -91,7 +91,7 @@ Needed for compiling programs that link with the library. export CFLAGS="%{optflags}" export CXXFLAGS="$CFLAGS -std=c++11" # lib-mt is alias for multi-threaded library support -%make_build -C lib lib-mt +%make_build prefix=%{_prefix} libdir=%{_libdir} -C lib lib-mt for dir in programs contrib/pzstd; do %make_build -C "$dir" done @@ -103,7 +103,7 @@ export CXXFLAGS="%{optflags} -std=c++11" #make %{?_smp_mflags} -C contrib/pzstd test-pzstd %install -%make_install V=1 VERBOSE=1 PREFIX=%{_prefix} LIBDIR=%{_libdir} +%make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir} install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1