Skip to content

S
sailfish-access-control
Commit f858fede authored by Niels Breet's avatar Niels Breet
Browse files
Options

Merge branch 'jb49681' into 'master' 

[aarch64] Specify libdir. Contributes to JB#49681

See merge request !6
parents c5e30f2c 3d5c35b0
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
glib/Makefile
View file @ f858fede
......@@ -5,7 +5,7 @@ PREFIX ?= /usr
LIBDIR ?= $(PREFIX)/lib
INCDIR ?= $(PREFIX)/include/$(NAME)
PKGCFGDIR ?= $(PREFIX)/lib/pkgconfig
PKGCFGDIR ?= $(LIBDIR)/pkgconfig
SO ?= .so.0
......
rpm/sailfish-access-control.spec
View file @ f858fede
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment