Merge branch 'jb49681' into 'master'

[aarch64] Specify pcdir with use of libdir. Contributes to JB#49681 See merge request mer-core/mce-dev!14
sailfishos · May 25, 2020 · 93b92f9 · 93b92f9
2 parents a50532c + 2f21ada
commit 93b92f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ distclean:: clean
 
 DESTDIR    ?= /tmp/test-mce-dev
 
-PCDIR      := /usr/lib/pkgconfig
+PCDIR      ?= /usr/lib/pkgconfig
 INCLUDEDIR := /usr/include/mce
 
 INSTALL_DIR  := install -m 755 -d

diff --git a/rpm/mce-headers.spec b/rpm/mce-headers.spec
@@ -31,7 +31,7 @@ make doc
 
 %install
 rm -rf %{buildroot}
-%make_install
+make install PCDIR=%{_libdir}/pkgconfig DESTDIR=%{?buildroot}
 install -d %{buildroot}/%{_docdir}/mce-doc/html/
 install -m 644 doc/html/* %{buildroot}/%{_docdir}/mce-doc/html/