diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-01-29 12:48:05 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-01-29 12:48:08 +0100 |
| commit | d9a48367ed0bc7493a9505afb1330040078f5c33 (patch) | |
| tree | 87e1a77baedb63c8b858a8eb6ca90b36f56b40b7 | |
| parent | 804584cb18349efb48ca7501af4b43b7641011ad (diff) | |
| download | nx-libs-d9a48367ed0bc7493a9505afb1330040078f5c33.tar.gz nx-libs-d9a48367ed0bc7493a9505afb1330040078f5c33.tar.bz2 nx-libs-d9a48367ed0bc7493a9505afb1330040078f5c33.zip | |
nx-libs.spec: Set PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} at build time.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | nx-libs.spec | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 9281720e6..29a840fef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,6 +84,7 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium library package (names) as obsolete. + 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. + + Set PREFIX=%{_prefix} USRLIBDIR=%{_libdir} SHLIBDIR=%{_libdir} at build time. * debian/roll-tarball.sh: + Install etc/ files into etc/ subfolder (rgb, nxagent.keyboard, diff --git a/nx-libs.spec b/nx-libs.spec index 77e7ad5c4..8570f05f4 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -729,7 +729,7 @@ chmod a+x my_configure; %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} export SHLIBGLOBALSFLAGS="%{__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 make install \ |