Commit d9a48367 authored by Mike Gabriel's avatar Mike Gabriel

nx-libs.spec: Set PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} at build time.

parent 804584cb
...@@ -84,6 +84,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium ...@@ -84,6 +84,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
library package (names) as obsolete. library package (names) as obsolete.
+ Don't depend on nx-libs base package with fixed version. + Don't depend on nx-libs base package with fixed version.
+ Don't fail if removing *.a files fails due to the files being non-present. + Don't fail if removing *.a files fails due to the files being non-present.
+ Set PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} at build time.
* debian/roll-tarball.sh: * debian/roll-tarball.sh:
+ Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard,
......
...@@ -729,7 +729,7 @@ chmod a+x my_configure; ...@@ -729,7 +729,7 @@ chmod a+x my_configure;
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
export SHLIBGLOBALSFLAGS="%{__global_ldflags}" export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
export LOCAL_LDFLAGS="%{__global_ldflags}" export LOCAL_LDFLAGS="%{__global_ldflags}"
make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir}
%install %install
make install \ make install \
......
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