Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
sailfish-access-control
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mer-core
sailfish-access-control
Commits
f858fede
Commit
f858fede
authored
May 22, 2020
by
Niels Breet
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jb49681' into 'master'
[aarch64] Specify libdir. Contributes to JB#49681 See merge request
!6
parents
c5e30f2c
3d5c35b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
glib/Makefile
glib/Makefile
+1
-1
rpm/sailfish-access-control.spec
rpm/sailfish-access-control.spec
+4
-4
No files found.
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment