Merge branch 'jb49681' into 'master'

[aarch64] Specify libdir. Contributes to JB#49681 See merge request mer-core/sailfish-access-control!6
sailfishos · May 22, 2020 · f858fed · f858fed
2 parents c5e30f2 + 3d5c35b
commit f858fed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/glib/Makefile b/glib/Makefile
@@ -5,7 +5,7 @@ PREFIX ?= /usr
 LIBDIR ?= $(PREFIX)/lib
 INCDIR ?= $(PREFIX)/include/$(NAME)
 
-PKGCFGDIR ?= $(PREFIX)/lib/pkgconfig
+PKGCFGDIR ?= $(LIBDIR)/pkgconfig
 
 SO ?= .so.0
 

diff --git a/rpm/sailfish-access-control.spec b/rpm/sailfish-access-control.spec
@@ -29,14 +29,14 @@ C language headers of the Sailfish Access Control library.
 %setup -q -n %{name}-%{version}/glib
 
 %build
-make ROOT=%{buildroot} %{_smp_mflags} VERSION=%{version}
-make ROOT=%{buildroot} VERSION=%{version} sailfishaccesscontrol.pc
+make LIBDIR=%{_libdir} ROOT=%{buildroot} %{_smp_mflags} VERSION=%{version}
+make LIBDIR=%{_libdir} ROOT=%{buildroot} VERSION=%{version} sailfishaccesscontrol.pc
 
 %install
 rm -rf %{buildroot}
 
-make ROOT=%{buildroot} install-libsailfishaccesscontrol
-make ROOT=%{buildroot} install-libsailfishaccesscontrol-dev
+make LIBDIR=%{_libdir} ROOT=%{buildroot} install-libsailfishaccesscontrol
+make LIBDIR=%{_libdir} ROOT=%{buildroot} install-libsailfishaccesscontrol-dev
 
 %post -p /sbin/ldconfig